X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=db7e8e0b1a1dc330397099ea0cfb63794db093a6;hp=aa43f9c9526cf2dfa2d859cc22f95e307a5cb8f7;hb=32c81aef875696bdd1b933e20ab91703ad63203d;hpb=488f5d3fee3a3ec602718d59edf8a61b6888470c diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index aa43f9c9..db7e8e0b 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -31,7 +31,10 @@ #include "samplingbar.h" -#include +#include +#include + +using namespace std; namespace pv { namespace toolbars { @@ -61,22 +64,26 @@ 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), + _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) { 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()), - this, SLOT(configure())); _sample_rate_value.setDecimals(0); _sample_rate_value.setSuffix("Hz"); @@ -93,15 +100,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); + addWidget(&_probes_button); addWidget(&_record_length_selector); _sample_rate_list_action = addWidget(&_sample_rate_list); _sample_rate_value_action = addWidget(&_sample_rate_value); @@ -116,22 +128,19 @@ 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) { - 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(); + _updating_device_selector = false; + + on_device_selected(); } struct sr_dev_inst* SamplingBar::get_selected_device() const @@ -162,10 +171,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() @@ -181,8 +192,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); @@ -194,8 +205,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); + + _sample_rate_action = _sample_rate_value_action; } else if ((gvar_list = g_variant_lookup_value(gvar_dict, "samplerates", G_VARIANT_TYPE("at")))) @@ -213,12 +225,18 @@ void SamplingBar::update_sample_rate_selector() } _sample_rate_list.show(); - _sample_rate_list_action->setVisible(true); g_variant_unref(gvar_list); + + _sample_rate_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 (_sample_rate_action) + _sample_rate_action->setVisible(true); } void SamplingBar::update_sample_rate_selector_value() @@ -229,8 +247,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; @@ -241,9 +259,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( @@ -262,9 +280,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) @@ -272,8 +290,11 @@ void SamplingBar::commit_sample_rate() index).value(); } + if (sample_rate == 0) + 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; @@ -282,7 +303,17 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_device_selected() { + using namespace pv::popups; + + if (_updating_device_selector) + return; + update_sample_rate_selector(); + + sr_dev_inst *const sdi = get_selected_device(); + _session.set_device(sdi); + + _configure_button.set_popup(new DeviceOptions(sdi, this)); } void SamplingBar::on_sample_rate_changed() @@ -290,17 +321,10 @@ void SamplingBar::on_sample_rate_changed() commit_sample_rate(); } -void SamplingBar::configure() +void SamplingBar::on_run_stop() { - commit_sample_rate(); - - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); - - pv::dialogs::DeviceOptions dlg(this, sdi); - dlg.exec(); - - update_sample_rate_selector_value(); + commit_sample_rate(); + run_stop(); } } // namespace toolbars