X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=0bf2270259b8f58138da8fb89bf19c605f0b6192;hp=5518e98b6a9ce6466515c4e14558f0656cdcb2e1;hb=449aec3cba1974d34a9c9a66b3cf8fc5208b62f4;hpb=4c60462b00cc329e61daedd1c2e66724077bd412

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 5518e98b..0bf22702 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -73,6 +73,7 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	configure_button_(this),
 	configure_button_action_(nullptr),
 	channels_button_(this),
+	channels_button_action_(nullptr),
 	sample_count_(" samples", this),
 	sample_rate_("Hz", this),
 	updating_sample_rate_(false),
@@ -82,6 +83,7 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	icon_green_(":/icons/status-green.svg"),
 	icon_grey_(":/icons/status-grey.svg"),
 	run_stop_button_(this),
+	run_stop_button_action_(nullptr),
 	menu_button_(this)
 {
 	setObjectName(QString::fromUtf8("MainBar"));
@@ -182,10 +184,10 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 
 	addWidget(&device_selector_);
 	configure_button_action_ = addWidget(&configure_button_);
-	addWidget(&channels_button_);
+	channels_button_action_ = addWidget(&channels_button_);
 	addWidget(&sample_count_);
 	addWidget(&sample_rate_);
-	addWidget(&run_stop_button_);
+	run_stop_button_action_ = addWidget(&run_stop_button_);
 #ifdef ENABLE_DECODE
 	addSeparator();
 	addWidget(add_decoder_button);
@@ -211,7 +213,6 @@ void MainBar::update_device_list()
 
 	if (std::find(devs.begin(), devs.end(), selected_device) == devs.end())
 		devs.push_back(selected_device);
-	assert(selected_device);
 
 	device_selector_.set_device_list(devs, selected_device);
 	update_device_config_widgets();
@@ -235,8 +236,10 @@ void MainBar::update_sample_rate_selector()
 	gsize num_elements;
 	map< const ConfigKey*, std::set<Capability> > keys;
 
-	if (updating_sample_rate_)
+	if (updating_sample_rate_) {
+		sample_rate_.show_none();
 		return;
+	}
 
 	const shared_ptr<devices::Device> device =
 		device_selector_.selected_device();
@@ -405,8 +408,16 @@ void MainBar::update_device_config_widgets()
 
 	const shared_ptr<devices::Device> device =
 		device_selector_.selected_device();
-	if (!device)
+
+	// Hide the widgets if no device is selected
+	channels_button_action_->setVisible(!!device);
+	run_stop_button_action_->setVisible(!!device);
+	if (!device) {
+		configure_button_action_->setVisible(false);
+		sample_count_.show_none();
+		sample_rate_.show_none();
 		return;
+	}
 
 	const shared_ptr<sigrok::Device> sr_dev = device->device();
 	if (!sr_dev)
@@ -463,9 +474,6 @@ void MainBar::commit_sample_count()
 {
 	uint64_t sample_count = 0;
 
-	if (updating_sample_count_)
-		return;
-
 	const shared_ptr<devices::Device> device =
 		device_selector_.selected_device();
 	if (!device)
@@ -474,31 +482,23 @@ void MainBar::commit_sample_count()
 	const shared_ptr<sigrok::Device> sr_dev = device->device();
 
 	sample_count = sample_count_.value();
-
-	// Set the sample count
-	assert(!updating_sample_count_);
-	updating_sample_count_ = true;
 	if (sample_count_supported_)
 	{
 		try {
 			sr_dev->config_set(ConfigKey::LIMIT_SAMPLES,
 				Glib::Variant<guint64>::create(sample_count));
-			on_config_changed();
+			update_sample_count_selector();
 		} catch (Error error) {
 			qDebug() << "Failed to configure sample count.";
 			return;
 		}
 	}
-	updating_sample_count_ = false;
 }
 
 void MainBar::commit_sample_rate()
 {
 	uint64_t sample_rate = 0;
 
-	if (updating_sample_rate_)
-		return;
-
 	const shared_ptr<devices::Device> device =
 		device_selector_.selected_device();
 	if (!device)
@@ -510,18 +510,14 @@ void MainBar::commit_sample_rate()
 	if (sample_rate == 0)
 		return;
 
-	// Set the samplerate
-	assert(!updating_sample_rate_);
-	updating_sample_rate_ = true;
 	try {
 		sr_dev->config_set(ConfigKey::SAMPLERATE,
 			Glib::Variant<guint64>::create(sample_rate));
-		on_config_changed();
+		update_sample_rate_selector();
 	} catch (Error error) {
 		qDebug() << "Failed to configure samplerate.";
 		return;
 	}
-	updating_sample_rate_ = false;
 }
 
 void MainBar::on_device_selected()
@@ -537,12 +533,14 @@ void MainBar::on_device_selected()
 
 void MainBar::on_sample_count_changed()
 {
-	commit_sample_count();
+	if (!updating_sample_count_)
+		commit_sample_count();
 }
 
 void MainBar::on_sample_rate_changed()
 {
-	commit_sample_rate();
+	if (!updating_sample_rate_)
+		commit_sample_rate();
 }
 
 void MainBar::on_run_stop()
@@ -555,9 +553,7 @@ void MainBar::on_run_stop()
 void MainBar::on_config_changed()
 {
 	commit_sample_count();
-	update_sample_count_selector();	
 	commit_sample_rate();	
-	update_sample_rate_selector();
 }
 
 bool MainBar::eventFilter(QObject *watched, QEvent *event)