X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=9e16c5119384f208f12f7760cb2c06dcca373d04;hp=d42e6de7293fd56102f85223ebcf87f93cd86c00;hb=df5396800830d41a83a837b95b0f3787571905cf;hpb=f4c92e1c49680738bde7d5fa08153fa914ac2920 diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index d42e6de7..9e16c511 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -31,107 +31,80 @@ #include "samplingbar.h" -#include +#include +#include +#include + +using std::string; namespace pv { namespace toolbars { -const uint64_t SamplingBar::RecordLengths[20] = { - 1000, - 2500, - 5000, - 10000, - 25000, - 50000, - 100000, - 250000, - 500000, - 1000000, - 2000000, - 5000000, - 10000000, - 25000000, - 50000000, - 100000000, - 250000000, - 500000000, - 1000000000, - 10000000000ULL, -}; - 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), - _record_length_selector(this), - _sample_rate_list(this), + _configure_button_action(NULL), + _probes_button(this), + _sample_count(" samples", this), + _sample_rate("Hz", this), + _updating_sample_rate(false), + _updating_sample_count(false), + _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())); + connect(&_sample_count, SIGNAL(value_changed()), + this, SLOT(on_sample_count_changed())); + connect(&_sample_rate, SIGNAL(value_changed()), + this, SLOT(on_sample_rate_changed())); - _sample_rate_value.setDecimals(0); - _sample_rate_value.setSuffix("Hz"); + _sample_count.show_min_max_step(0, UINT64_MAX, 1); - 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), - qVariantFromValue(l)); - g_free(text); - - if (l == DefaultRecordLength) - _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(&_record_length_selector); - _sample_rate_list_action = addWidget(&_sample_rate_list); - _sample_rate_value_action = addWidget(&_sample_rate_value); - addWidget(&_run_stop_button); + _configure_button_action = addWidget(&_configure_button); + addWidget(&_probes_button); + addWidget(&_sample_count); + 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 @@ -153,111 +126,136 @@ void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi) } } -uint64_t SamplingBar::get_record_length() const -{ - const int index = _record_length_selector.currentIndex(); - if (index < 0) - return 0; - - 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() { const sr_dev_inst *const sdi = get_selected_device(); - const struct sr_samplerates *samplerates; - - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); + GVariant *gvar_dict, *gvar_list; + const uint64_t *elements = NULL; + gsize num_elements; if (!sdi) return; - if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE, - (const void **)&samplerates, 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 (samplerates->step) + if ((gvar_list = g_variant_lookup_value(gvar_dict, + "samplerate-steps", G_VARIANT_TYPE("at")))) { - _sample_rate_value.setRange( - samplerates->low, samplerates->high); - _sample_rate_value.setSingleStep(samplerates->step); - _sample_rate_value_action->setVisible(true); + elements = (const uint64_t *)g_variant_get_fixed_array( + gvar_list, &num_elements, sizeof(uint64_t)); + _sample_rate.show_min_max_step(elements[0], elements[1], + elements[2]); + g_variant_unref(gvar_list); } - else + else if ((gvar_list = g_variant_lookup_value(gvar_dict, + "samplerates", G_VARIANT_TYPE("at")))) { - _sample_rate_list.clear(); - for (const uint64_t *rate = samplerates->list; - *rate; rate++) - _sample_rate_list.addItem( - sr_samplerate_string(*rate), - qVariantFromValue(*rate)); - _sample_rate_list.show(); - _sample_rate_list_action->setVisible(true); + elements = (const uint64_t *)g_variant_get_fixed_array( + gvar_list, &num_elements, sizeof(uint64_t)); + _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(); } void SamplingBar::update_sample_rate_selector_value() { sr_dev_inst *const sdi = get_selected_device(); + GVariant *gvar; + uint64_t samplerate; + assert(sdi); - uint64_t *samplerate = NULL; - if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, - (const void**)&samplerate, 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; } + samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); + _updating_sample_rate = true; + _sample_rate.set_value(samplerate); + _updating_sample_rate = false; +} + +void SamplingBar::update_sample_count_selector() +{ + sr_dev_inst *const sdi = get_selected_device(); + GVariant *gvar; + uint64_t samplecount; - if (_sample_rate_value_action->isVisible()) - _sample_rate_value.setValue(*samplerate); - else if (_sample_rate_list_action->isVisible()) + assert(sdi); + + if (sr_config_get(sdi->driver, sdi, NULL, + SR_CONF_LIMIT_SAMPLES, &gvar) != SR_OK) + { + _sample_count.show_none(); + } + else { - for (int i = 0; i < _sample_rate_list.count(); i++) - if (*samplerate == _sample_rate_list.itemData( - i).value()) - _sample_rate_list.setCurrentIndex(i); + _sample_count.show_min_max_step(0, UINT64_MAX, 1); + + samplecount = g_variant_get_uint64(gvar); + g_variant_unref(gvar); + + _updating_sample_count = true; + _sample_count.set_value(samplecount); + _updating_sample_count = false; } } -void SamplingBar::commit_sample_rate() +void SamplingBar::commit_sample_count() { - uint64_t sample_rate = 0; + uint64_t sample_count = 0; sr_dev_inst *const sdi = get_selected_device(); assert(sdi); - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); + sample_count = _sample_count.value(); - 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(); + // Set the sample count + if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, + g_variant_new_uint64(sample_count)) != SR_OK) { + qDebug() << "Failed to configure sample count."; + return; } +} + +void SamplingBar::commit_sample_rate() +{ + uint64_t sample_rate = 0; + + sr_dev_inst *const sdi = get_selected_device(); + assert(sdi); + + sample_rate = _sample_rate.value(); + if (sample_rate == 0) + return; // Set the samplerate - if (sr_config_set(sdi, SR_CONF_SAMPLERATE, - &sample_rate) != SR_OK) { + if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE, + g_variant_new_uint64(sample_rate)) != SR_OK) { qDebug() << "Failed to configure samplerate."; return; } @@ -265,25 +263,48 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_device_selected() { + using namespace pv::popups; + + if (_updating_device_selector) + return; + + sr_dev_inst *const sdi = get_selected_device(); + _session.set_device(sdi); + + // 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 the probes popup + Probes *const probes = new Probes(_session, this); + _probes_button.set_popup(probes); + + // Update sweep timing widgets. + update_sample_count_selector(); update_sample_rate_selector(); + + if (_sample_count.value() == 0) + _sample_count.set_value(DefaultRecordLength); } -void SamplingBar::on_sample_rate_changed() +void SamplingBar::on_sample_count_changed() { - commit_sample_rate(); + if(!_updating_sample_count) + commit_sample_count(); } -void SamplingBar::configure() +void SamplingBar::on_sample_rate_changed() { - commit_sample_rate(); - - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); - - pv::dialogs::DeviceOptions dlg(this, sdi); - dlg.exec(); + if (!_updating_sample_rate) + commit_sample_rate(); +} - update_sample_rate_selector_value(); +void SamplingBar::on_run_stop() +{ + commit_sample_rate(); + run_stop(); } } // namespace toolbars