X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=06c47fd3efa5f40b4369b75cccfc673bd8cde431;hp=401652cbe7b251eba52fe6bcd998cd2a98dd80d4;hb=1198b8872516662c257e5dcdec346094ed4f32dd;hpb=9f3d12f3573e55f7031510e43bc1583bc7fe72ee diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 401652cb..06c47fd3 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -31,7 +31,11 @@ #include "samplingbar.h" -#include +#include +#include +#include + +using std::string; namespace pv { namespace toolbars { @@ -61,12 +65,18 @@ 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), _record_length_selector(this), - _sample_rate_list(this), + _sample_rate("Hz", this), + _updating_sample_rate(false), + _icon_red(":/icons/status-red.svg"), _icon_green(":/icons/status-green.svg"), _icon_grey(":/icons/status-grey.svg"), _run_stop_button(this) @@ -75,17 +85,14 @@ 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"); + connect(&_sample_rate, SIGNAL(value_changed()), + this, SLOT(on_sample_rate_changed())); for (size_t i = 0; i < countof(RecordLengths); i++) { 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); @@ -93,45 +100,41 @@ 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); + _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); - addWidget(&_run_stop_button); + addWidget(&_sample_rate); - connect(&_sample_rate_list, SIGNAL(currentIndexChanged(int)), - this, SLOT(on_sample_rate_changed())); - connect(&_sample_rate_value, SIGNAL(editingFinished()), - this, SLOT(on_sample_rate_changed())); + addWidget(&_run_stop_button); } 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 +165,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() @@ -175,26 +180,26 @@ void SamplingBar::update_sample_rate_selector() const uint64_t *elements = NULL; gsize num_elements; - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); - if (!sdi) return; - if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE, - &gvar_dict, sdi) != SR_OK) - return; + _updating_sample_rate = true; - _sample_rate_list_action->setVisible(false); - _sample_rate_value_action->setVisible(false); + if (sr_config_list(sdi->driver, sdi, NULL, + SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK) + { + _sample_rate.show_none(); + _updating_sample_rate = false; + return; + } if ((gvar_list = g_variant_lookup_value(gvar_dict, - "samplerate-steps", G_VARIANT_TYPE("at")))) { + "samplerate-steps", G_VARIANT_TYPE("at")))) + { elements = (const uint64_t *)g_variant_get_fixed_array( 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); + _sample_rate.show_min_max_step(elements[0], elements[1], + elements[2]); g_variant_unref(gvar_list); } else if ((gvar_list = g_variant_lookup_value(gvar_dict, @@ -202,20 +207,10 @@ void SamplingBar::update_sample_rate_selector() { elements = (const uint64_t *)g_variant_get_fixed_array( gvar_list, &num_elements, sizeof(uint64_t)); - _sample_rate_list.clear(); - - for (unsigned int i = 0; i < num_elements; i++) - { - char *const s = sr_samplerate_string(elements[i]); - _sample_rate_list.addItem(QString(s), - qVariantFromValue(elements[i])); - g_free(s); - } - - _sample_rate_list.show(); - _sample_rate_list_action->setVisible(true); + _sample_rate.show_list(elements, num_elements); g_variant_unref(gvar_list); } + _updating_sample_rate = false; g_variant_unref(gvar_dict); update_sample_rate_selector_value(); @@ -229,8 +224,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; @@ -238,18 +233,9 @@ void SamplingBar::update_sample_rate_selector_value() samplerate = g_variant_get_uint64(gvar); g_variant_unref(gvar); - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); - - if (_sample_rate_value_action->isVisible()) - _sample_rate_value.setValue(samplerate); - else if (_sample_rate_list_action->isVisible()) - { - for (int i = 0; i < _sample_rate_list.count(); i++) - if (samplerate == _sample_rate_list.itemData( - i).value()) - _sample_rate_list.setCurrentIndex(i); - } + _updating_sample_rate = true; + _sample_rate.set_value(samplerate); + _updating_sample_rate = false; } void SamplingBar::commit_sample_rate() @@ -259,21 +245,12 @@ void SamplingBar::commit_sample_rate() sr_dev_inst *const sdi = get_selected_device(); assert(sdi); - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); - - if (_sample_rate_value_action->isVisible()) - sample_rate = (uint64_t)_sample_rate_value.value(); - else if (_sample_rate_list_action->isVisible()) - { - const int index = _sample_rate_list.currentIndex(); - if (index >= 0) - sample_rate = _sample_rate_list.itemData( - index).value(); - } + sample_rate = _sample_rate.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,25 +259,31 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_device_selected() { - update_sample_rate_selector(); -} + 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(); + // 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(); + // Update the probes popup + Probes *const probes = new Probes(_session, this); + _probes_button.set_popup(probes); +} + +void SamplingBar::on_sample_rate_changed() +{ + if (!_updating_sample_rate) + commit_sample_rate(); } void SamplingBar::on_run_stop()