X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=0754f001e9a1828b3cd2fa66e7d8d9ee497da330;hb=dd63af740355865cc0659dfba74ecf4445414bc8;hp=c35faadad49f5773a179810165bc8b5e8dda4013;hpb=6374d2f8a360e9ca7670d437fc783f8086de1d08;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index c35faada..0754f001 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -31,8 +31,11 @@
 
 #include "samplingbar.h"
 
+#include <pv/devicemanager.h>
 #include <pv/dialogs/deviceoptions.h>
 
+using namespace std;
+
 namespace pv {
 namespace toolbars {
 
@@ -72,7 +75,7 @@ SamplingBar::SamplingBar(QWidget *parent) :
 	_run_stop_button(this)
 {
 	connect(&_run_stop_button, SIGNAL(clicked()),
-		this, SIGNAL(run_stop()));
+		this, SLOT(on_run_stop()));
 	connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
 		this, SLOT(on_device_selected()));
 	connect(&_configure_button, SIGNAL(clicked()),
@@ -119,16 +122,9 @@ void SamplingBar::set_device_list(
 	_device_selector.clear();
 
 	BOOST_FOREACH (sr_dev_inst *sdi, devices) {
-		QString title;
-		if (sdi->vendor && sdi->vendor[0])
-			title += sdi->vendor + QString(" ");
-		if (sdi->model && sdi->model[0])
-			title += sdi->model + QString(" ");
-		if (sdi->version && sdi->version[0])
-			title += sdi->version + QString(" ");
-
-		_device_selector.addItem(title, qVariantFromValue(
-			(void*)sdi));
+		const string title = DeviceManager::format_device_title(sdi);
+		_device_selector.addItem(title.c_str(),
+			qVariantFromValue((void*)sdi));
 	}
 
 	update_sample_rate_selector();
@@ -174,6 +170,7 @@ void SamplingBar::update_sample_rate_selector()
 	GVariant *gvar_dict, *gvar_list;
 	const uint64_t *elements = NULL;
 	gsize num_elements;
+	QAction *selector_action = NULL;
 
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
@@ -194,8 +191,9 @@ void SamplingBar::update_sample_rate_selector()
 				gvar_list, &num_elements, sizeof(uint64_t));
 		_sample_rate_value.setRange(elements[0], elements[1]);
 		_sample_rate_value.setSingleStep(elements[2]);
-		_sample_rate_value_action->setVisible(true);
 		g_variant_unref(gvar_list);
+
+		selector_action = _sample_rate_value_action;
 	}
 	else if ((gvar_list = g_variant_lookup_value(gvar_dict,
 			"samplerates", G_VARIANT_TYPE("at"))))
@@ -213,12 +211,18 @@ void SamplingBar::update_sample_rate_selector()
 		}
 
 		_sample_rate_list.show();
-		_sample_rate_list_action->setVisible(true);
 		g_variant_unref(gvar_list);
+
+		selector_action = _sample_rate_list_action;
 	}
 
 	g_variant_unref(gvar_dict);
 	update_sample_rate_selector_value();
+
+	// We delay showing the action, so that value change events
+	// are ignored.
+	if (selector_action)
+		selector_action->setVisible(true);
 }
 
 void SamplingBar::update_sample_rate_selector_value()
@@ -272,6 +276,9 @@ void SamplingBar::commit_sample_rate()
 				index).value<uint64_t>();
 	}
 
+	if (sample_rate == 0)
+		return;
+
 	// Set the samplerate
 	if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
 		g_variant_new_uint64(sample_rate)) != SR_OK) {
@@ -283,6 +290,7 @@ void SamplingBar::commit_sample_rate()
 void SamplingBar::on_device_selected()
 {
 	update_sample_rate_selector();
+	device_selected();
 }
 
 void SamplingBar::on_sample_rate_changed()
@@ -303,5 +311,11 @@ void SamplingBar::on_configure()
 	update_sample_rate_selector_value();
 }
 
+void SamplingBar::on_run_stop()
+{
+	commit_sample_rate();	
+	run_stop();
+}
+
 } // namespace toolbars
 } // namespace pv