X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=bafb9cd406bf05f9c76b54f2d91156e34d593e93;hb=95237c18d988245fd5f484b70a481891982f5f37;hp=90dc6575896b16d9aa2effaf1dc5f763401362fe;hpb=f9541bde559ebdad1dff36bd27a2656ada99c6da;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 90dc6575..bafb9cd4 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -31,7 +31,10 @@
 
 #include "samplingbar.h"
 
-#include <pv/dialogs/deviceoptions.h>
+#include <pv/devicemanager.h>
+#include <pv/popups/deviceoptions.h>
+
+using namespace std;
 
 namespace pv {
 namespace toolbars {
@@ -61,12 +64,16 @@ const uint64_t SamplingBar::RecordLengths[20] = {
 
 const uint64_t SamplingBar::DefaultRecordLength = 1000000;
 
-SamplingBar::SamplingBar(QWidget *parent) :
+SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	QToolBar("Sampling Bar", parent),
+	_session(session),
 	_device_selector(this),
+	_updating_device_selector(false),
 	_configure_button(this),
+	_probes_button(this),
 	_record_length_selector(this),
 	_sample_rate_list(this),
+	_icon_red(":/icons/status-red.svg"),
 	_icon_green(":/icons/status-green.svg"),
 	_icon_grey(":/icons/status-grey.svg"),
 	_run_stop_button(this)
@@ -75,8 +82,6 @@ SamplingBar::SamplingBar(QWidget *parent) :
 		this, SLOT(on_run_stop()));
 	connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
 		this, SLOT(on_device_selected()));
-	connect(&_configure_button, SIGNAL(clicked()),
-		this, SLOT(on_configure()));
 
 	_sample_rate_value.setDecimals(0);
 	_sample_rate_value.setSuffix("Hz");
@@ -93,15 +98,18 @@ SamplingBar::SamplingBar(QWidget *parent) :
 			_record_length_selector.setCurrentIndex(i);
 	}
 
-	set_sampling(false);
+	set_capture_state(pv::SigSession::Stopped);
 
 	_configure_button.setIcon(QIcon::fromTheme("configure",
 		QIcon(":/icons/configure.png")));
+	_probes_button.setIcon(QIcon::fromTheme("probes",
+		QIcon(":/icons/probes.svg")));
 
 	_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
 	addWidget(&_device_selector);
 	addWidget(&_configure_button);
+	addWidget(&_probes_button);
 	addWidget(&_record_length_selector);
 	_sample_rate_list_action = addWidget(&_sample_rate_list);
 	_sample_rate_value_action = addWidget(&_sample_rate_value);
@@ -116,21 +124,18 @@ SamplingBar::SamplingBar(QWidget *parent) :
 void SamplingBar::set_device_list(
 	const std::list<struct sr_dev_inst*> &devices)
 {
+	_updating_device_selector = true;
+
 	_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));
 	}
 
+	_updating_device_selector = false;
+
 	update_sample_rate_selector();
 }
 
@@ -162,10 +167,12 @@ uint64_t SamplingBar::get_record_length() const
 	return _record_length_selector.itemData(index).value<uint64_t>();
 }
 
-void SamplingBar::set_sampling(bool sampling)
+void SamplingBar::set_capture_state(pv::SigSession::capture_state state)
 {
-	_run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
-	_run_stop_button.setText(sampling ? "Stop" : "Run");
+	const QIcon *icons[] = {&_icon_grey, &_icon_red, &_icon_green};
+	_run_stop_button.setIcon(*icons[state]);
+	_run_stop_button.setText((state == pv::SigSession::Stopped) ?
+		tr("Run") : tr("Stop"));
 }
 
 void SamplingBar::update_sample_rate_selector()
@@ -293,26 +300,23 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
-	update_sample_rate_selector();
-	device_selected();
-}
+	using namespace pv::popups;
 
-void SamplingBar::on_sample_rate_changed()
-{
-	commit_sample_rate();
-}
+	if (_updating_device_selector)
+		return;
 
-void SamplingBar::on_configure()
-{
-	commit_sample_rate();
+	update_sample_rate_selector();
 
 	sr_dev_inst *const sdi = get_selected_device();
-	assert(sdi);
+	_session.set_device(sdi);
 
-	pv::dialogs::DeviceOptions dlg(this, sdi);
-	dlg.exec();
+	_configure_button.set_popup(new DeviceOptions(sdi, this));
+	_probes_button.set_popup(new Probes(_session, this));
+}
 
-	update_sample_rate_selector_value();
+void SamplingBar::on_sample_rate_changed()
+{
+	commit_sample_rate();
 }
 
 void SamplingBar::on_run_stop()