X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=e517ff78c5cd594f804b55ef4e464f5e9d764c06;hp=3c8b71e2f7b59a8162fcf39f23135c2d819cd46b;hb=13fe60f537c78661f62386b3bec202cbb42364fe;hpb=5e685656d6686eb66a39450d1b324f6382fc60c5

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 3c8b71e..e517ff7 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -35,7 +35,6 @@
 
 #include <boost/algorithm/string/join.hpp>
 
-#include <pv/data/decodesignal.hpp>
 #include <pv/devicemanager.hpp>
 #include <pv/devices/hardwaredevice.hpp>
 #include <pv/devices/inputfile.hpp>
@@ -52,6 +51,7 @@
 #include <pv/widgets/importmenu.hpp>
 #ifdef ENABLE_DECODE
 #include <pv/widgets/decodermenu.hpp>
+#include <pv/data/decodesignal.hpp>
 #endif
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -302,6 +302,21 @@ void MainBar::update_sample_rate_selector()
 
 	const shared_ptr<sigrok::Device> sr_dev = device->device();
 
+	sample_rate_.allow_user_entered_values(false);
+	if (sr_dev->config_check(ConfigKey::EXTERNAL_CLOCK, Capability::GET)) {
+		try {
+			auto gvar = sr_dev->config_get(ConfigKey::EXTERNAL_CLOCK);
+			if (gvar.gobj()) {
+				bool value = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(
+					gvar).get();
+				sample_rate_.allow_user_entered_values(value);
+			}
+		} catch (Error& error) {
+			// Do nothing
+		}
+	}
+
+
 	if (sr_dev->config_check(ConfigKey::SAMPLERATE, Capability::LIST)) {
 		try {
 			gvar_dict = sr_dev->config_list(ConfigKey::SAMPLERATE);
@@ -369,7 +384,7 @@ void MainBar::update_sample_rate_selector_value()
 		sample_rate_.set_value(samplerate);
 		updating_sample_rate_ = false;
 	} catch (Error& error) {
-		qDebug() << tr("Failed to get value of sample rate:") << error.what();
+		qDebug() << tr("Failed to get sample rate:") << error.what();
 	}
 }
 
@@ -494,8 +509,6 @@ void MainBar::commit_sample_rate()
 	const shared_ptr<sigrok::Device> sr_dev = device->device();
 
 	sample_rate = sample_rate_.value();
-	if (sample_rate == 0)
-		return;
 
 	try {
 		sr_dev->config_set(ConfigKey::SAMPLERATE,
@@ -543,8 +556,7 @@ void MainBar::commit_sample_count()
 void MainBar::show_session_error(const QString text, const QString info_text)
 {
 	QMessageBox msg(this);
-	msg.setText(text);
-	msg.setInformativeText(info_text);
+	msg.setText(text + "\n\n" + info_text);
 	msg.setStandardButtons(QMessageBox::Ok);
 	msg.setIcon(QMessageBox::Warning);
 	msg.exec();
@@ -592,9 +604,9 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
 		const pv::util::Timestamp& end_time = trace_view->cursors()->second()->time();
 
 		const uint64_t start_sample = (uint64_t)max(
-			(double)0, start_time.convert_to<double>() * samplerate);
+			0.0, start_time.convert_to<double>() * samplerate);
 		const uint64_t end_sample = (uint64_t)max(
-			(double)0, end_time.convert_to<double>() * samplerate);
+			0.0, end_time.convert_to<double>() * samplerate);
 
 		if ((start_sample == 0) && (end_sample == 0)) {
 			// Both cursors are negative and were clamped to 0
@@ -729,6 +741,10 @@ void MainBar::on_sample_rate_changed()
 
 void MainBar::on_config_changed()
 {
+	// We want to also call update_sample_rate_selector() here in case
+	// the user changed the SR_CONF_EXTERNAL_CLOCK option. However,
+	// commit_sample_rate() does this already, so we don't call it here
+
 	commit_sample_count();
 	commit_sample_rate();
 }