X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=0e3ce62374bf2c053ebf8a5eb57bd188bfcf11a8;hp=0754f001e9a1828b3cd2fa66e7d8d9ee497da330;hb=b3e8a5d8e8139278a40508694e0b179170fffa14;hpb=dd63af740355865cc0659dfba74ecf4445414bc8 diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 0754f001..0e3ce623 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -32,9 +32,9 @@ #include "samplingbar.h" #include -#include +#include -using namespace std; +using std::string; namespace pv { namespace toolbars { @@ -64,12 +64,19 @@ 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), + _configure_button_action(NULL), + _probes_button(this), + _probes_popup(_session, this), _record_length_selector(this), + _sample_rate_action(NULL), _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) @@ -78,8 +85,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"); @@ -88,7 +93,7 @@ SamplingBar::SamplingBar(QWidget *parent) : { const uint64_t &l = RecordLengths[i]; char *const text = sr_si_string_u64(l, " samples"); - _record_length_selector.addItem(QString(text), + _record_length_selector.addItem(QString::fromUtf8(text), qVariantFromValue(l)); g_free(text); @@ -96,15 +101,20 @@ 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"))); + _probes_button.set_popup(&_probes_popup); + _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); addWidget(&_device_selector); - addWidget(&_configure_button); + _configure_button_action = 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); @@ -119,6 +129,8 @@ SamplingBar::SamplingBar(QWidget *parent) : void SamplingBar::set_device_list( const std::list &devices) { + _updating_device_selector = true; + _device_selector.clear(); BOOST_FOREACH (sr_dev_inst *sdi, devices) { @@ -127,7 +139,9 @@ void SamplingBar::set_device_list( qVariantFromValue((void*)sdi)); } - update_sample_rate_selector(); + _updating_device_selector = false; + + on_device_selected(); } struct sr_dev_inst* SamplingBar::get_selected_device() const @@ -158,10 +172,12 @@ uint64_t SamplingBar::get_record_length() const return _record_length_selector.itemData(index).value(); } -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() @@ -170,7 +186,6 @@ 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); @@ -178,8 +193,8 @@ void SamplingBar::update_sample_rate_selector() if (!sdi) return; - if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE, - &gvar_dict, sdi) != SR_OK) + if (sr_config_list(sdi->driver, sdi, NULL, + SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK) return; _sample_rate_list_action->setVisible(false); @@ -193,7 +208,7 @@ void SamplingBar::update_sample_rate_selector() _sample_rate_value.setSingleStep(elements[2]); g_variant_unref(gvar_list); - selector_action = _sample_rate_value_action; + _sample_rate_action = _sample_rate_value_action; } else if ((gvar_list = g_variant_lookup_value(gvar_dict, "samplerates", G_VARIANT_TYPE("at")))) @@ -205,7 +220,7 @@ void SamplingBar::update_sample_rate_selector() for (unsigned int i = 0; i < num_elements; i++) { char *const s = sr_samplerate_string(elements[i]); - _sample_rate_list.addItem(QString(s), + _sample_rate_list.addItem(QString::fromUtf8(s), qVariantFromValue(elements[i])); g_free(s); } @@ -213,7 +228,7 @@ void SamplingBar::update_sample_rate_selector() _sample_rate_list.show(); g_variant_unref(gvar_list); - selector_action = _sample_rate_list_action; + _sample_rate_action = _sample_rate_list_action; } g_variant_unref(gvar_dict); @@ -221,8 +236,8 @@ void SamplingBar::update_sample_rate_selector() // We delay showing the action, so that value change events // are ignored. - if (selector_action) - selector_action->setVisible(true); + if (_sample_rate_action) + _sample_rate_action->setVisible(true); } void SamplingBar::update_sample_rate_selector_value() @@ -233,8 +248,8 @@ void SamplingBar::update_sample_rate_selector_value() assert(sdi); - if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, - &gvar, sdi) != SR_OK) { + if (sr_config_get(sdi->driver, sdi, NULL, + SR_CONF_SAMPLERATE, &gvar) != SR_OK) { qDebug() << "WARNING: Failed to get value of sample rate"; return; @@ -245,9 +260,9 @@ void SamplingBar::update_sample_rate_selector_value() assert(_sample_rate_value_action); assert(_sample_rate_list_action); - if (_sample_rate_value_action->isVisible()) + if (_sample_rate_action == _sample_rate_value_action) _sample_rate_value.setValue(samplerate); - else if (_sample_rate_list_action->isVisible()) + else if (_sample_rate_action == _sample_rate_list_action) { for (int i = 0; i < _sample_rate_list.count(); i++) if (samplerate == _sample_rate_list.itemData( @@ -266,9 +281,9 @@ void SamplingBar::commit_sample_rate() assert(_sample_rate_value_action); assert(_sample_rate_list_action); - if (_sample_rate_value_action->isVisible()) + if (_sample_rate_action == _sample_rate_value_action) sample_rate = (uint64_t)_sample_rate_value.value(); - else if (_sample_rate_list_action->isVisible()) + else if (_sample_rate_action == _sample_rate_list_action) { const int index = _sample_rate_list.currentIndex(); if (index >= 0) @@ -280,7 +295,7 @@ void SamplingBar::commit_sample_rate() return; // Set the samplerate - if (sr_config_set(sdi, SR_CONF_SAMPLERATE, + if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE, g_variant_new_uint64(sample_rate)) != SR_OK) { qDebug() << "Failed to configure samplerate."; return; @@ -289,26 +304,26 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_device_selected() { - update_sample_rate_selector(); - device_selected(); -} + using pv::popups::DeviceOptions; -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(); + // Update the configure popup + DeviceOptions *const opts = new DeviceOptions(sdi, this); + _configure_button_action->setVisible( + !opts->binding().properties().empty()); + _configure_button.set_popup(opts); +} - update_sample_rate_selector_value(); +void SamplingBar::on_sample_rate_changed() +{ + commit_sample_rate(); } void SamplingBar::on_run_stop()