X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=21421bca34f16b235b644ca3096996f2aa9e0a2d;hp=778f7aa1cdf747a74d00995da7d051e5a1ba7deb;hb=c042b5d2b18fca9fe79b9a33b730b890387bbfc7;hpb=488f068c7ecdc101820a3c48be61fb45a7e683dc diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 778f7aa1..21421bca 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -22,48 +22,38 @@ #include -#include - -#include - #include #include +#include +#include #include "samplingbar.h" #include #include -#include +#include +#include +#include + +using std::map; +using std::vector; +using std::max; +using std::min; +using std::shared_ptr; using std::string; +using sigrok::Capability; +using sigrok::ConfigKey; +using sigrok::Device; +using sigrok::Error; + 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; +const uint64_t SamplingBar::MinSampleCount = 100ULL; +const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL; +const uint64_t SamplingBar::DefaultSampleCount = 1000000; SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : QToolBar("Sampling Bar", parent), @@ -72,103 +62,93 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : _updating_device_selector(false), _configure_button(this), _configure_button_action(NULL), - _probes_button(this), - _record_length_selector(this), - _sample_rate_action(NULL), - _sample_rate_list(this), + _channels_button(this), + _sample_count(" samples", this), + _sample_rate("Hz", this), + _updating_sample_rate(false), + _updating_sample_count(false), + _sample_count_supported(false), _icon_red(":/icons/status-red.svg"), _icon_green(":/icons/status-green.svg"), _icon_grey(":/icons/status-grey.svg"), _run_stop_button(this) { + setObjectName(QString::fromUtf8("SamplingBar")); + connect(&_run_stop_button, SIGNAL(clicked()), this, SLOT(on_run_stop())); connect(&_device_selector, SIGNAL(currentIndexChanged (int)), this, SLOT(on_device_selected())); + 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"); - - 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::fromUtf8(text), - qVariantFromValue(l)); - g_free(text); - - if (l == DefaultRecordLength) - _record_length_selector.setCurrentIndex(i); - } + _sample_count.show_min_max_step(0, UINT64_MAX, 1); 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"))); + _channels_button.setIcon(QIcon::fromTheme("channels", + QIcon(":/icons/channels.svg"))); _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); addWidget(&_device_selector); _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(&_channels_button); + addWidget(&_sample_count); + addWidget(&_sample_rate); + addWidget(&_run_stop_button); - 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())); + _sample_count.installEventFilter(this); + _sample_rate.installEventFilter(this); } void SamplingBar::set_device_list( - const std::list &devices) + const std::list< std::pair, std::string> > &devices, + shared_ptr selected) { + int selected_index = -1; + + assert(selected); + _updating_device_selector = true; _device_selector.clear(); - BOOST_FOREACH (sr_dev_inst *sdi, devices) { - const string title = DeviceManager::format_device_title(sdi); - _device_selector.addItem(title.c_str(), - qVariantFromValue((void*)sdi)); - } + for (auto entry : devices) { + auto device = entry.first; + auto display_name = entry.second; - _updating_device_selector = false; + assert(device); - on_device_selected(); -} + if (selected == device) + selected_index = _device_selector.count(); -struct sr_dev_inst* SamplingBar::get_selected_device() const -{ - const int index = _device_selector.currentIndex(); - if (index < 0) - return NULL; + _device_selector.addItem(display_name.c_str(), + qVariantFromValue(device)); + } - return (sr_dev_inst*)_device_selector.itemData( - index).value(); -} + // The selected device should have been in the list + assert(selected_index != -1); + _device_selector.setCurrentIndex(selected_index); -void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi) -{ - for (int i = 0; i < _device_selector.count(); i++) - if (sdi == _device_selector.itemData(i).value()) { - _device_selector.setCurrentIndex(i); - return; - } + update_device_config_widgets(); + + _updating_device_selector = false; } -uint64_t SamplingBar::get_record_length() const +shared_ptr SamplingBar::get_selected_device() const { - const int index = _record_length_selector.currentIndex(); + const int index = _device_selector.currentIndex(); if (index < 0) - return 0; + return shared_ptr(); - return _record_length_selector.itemData(index).value(); + return _device_selector.itemData(index).value>(); } void SamplingBar::set_capture_state(pv::SigSession::capture_state state) @@ -177,151 +157,279 @@ void SamplingBar::set_capture_state(pv::SigSession::capture_state state) _run_stop_button.setIcon(*icons[state]); _run_stop_button.setText((state == pv::SigSession::Stopped) ? tr("Run") : tr("Stop")); + _run_stop_button.setShortcut(QKeySequence(Qt::Key_Space)); } void SamplingBar::update_sample_rate_selector() { - const sr_dev_inst *const sdi = get_selected_device(); - GVariant *gvar_dict, *gvar_list; + Glib::VariantContainerBase gvar_dict; + GVariant *gvar_list; const uint64_t *elements = NULL; gsize num_elements; - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); - - if (!sdi) + if (_updating_sample_rate) return; - if (sr_config_list(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK) + const shared_ptr device = get_selected_device(); + if (!device) return; - _sample_rate_list_action->setVisible(false); - _sample_rate_value_action->setVisible(false); + assert(!_updating_sample_rate); + _updating_sample_rate = true; + + try { + gvar_dict = device->config_list(ConfigKey::SAMPLERATE); + } catch (Error error) { + _sample_rate.show_none(); + _updating_sample_rate = false; + return; + } - if ((gvar_list = g_variant_lookup_value(gvar_dict, - "samplerate-steps", G_VARIANT_TYPE("at")))) { + if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(), + "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]); + + const uint64_t min = elements[0]; + const uint64_t max = elements[1]; + const uint64_t step = elements[2]; + g_variant_unref(gvar_list); - _sample_rate_action = _sample_rate_value_action; + assert(min > 0); + assert(max > 0); + assert(max > min); + assert(step > 0); + + if (step == 1) + _sample_rate.show_125_list(min, max); + else + { + // When the step is not 1, we cam't make a 1-2-5-10 + // list of sample rates, because we may not be able to + // make round numbers. Therefore in this case, show a + // spin box. + _sample_rate.show_min_max_step(min, max, step); + } } - else if ((gvar_list = g_variant_lookup_value(gvar_dict, + else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(), "samplerates", G_VARIANT_TYPE("at")))) { 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::fromUtf8(s), - qVariantFromValue(elements[i])); - g_free(s); - } - - _sample_rate_list.show(); + _sample_rate.show_list(elements, num_elements); g_variant_unref(gvar_list); - - _sample_rate_action = _sample_rate_list_action; } + _updating_sample_rate = false; - 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() { - sr_dev_inst *const sdi = get_selected_device(); - GVariant *gvar; - uint64_t samplerate; + if (_updating_sample_rate) + return; - assert(sdi); + const shared_ptr device = get_selected_device(); + if (!device) + return; - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar) != SR_OK) { - qDebug() << - "WARNING: Failed to get value of sample rate"; + try { + auto gvar = device->config_get(ConfigKey::SAMPLERATE); + uint64_t samplerate = + Glib::VariantBase::cast_dynamic>(gvar).get(); + assert(!_updating_sample_rate); + _updating_sample_rate = true; + _sample_rate.set_value(samplerate); + _updating_sample_rate = false; + } catch (Error error) { + 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); +void SamplingBar::update_sample_count_selector() +{ + if (_updating_sample_count) + return; - if (_sample_rate_action == _sample_rate_value_action) - _sample_rate_value.setValue(samplerate); - else if (_sample_rate_action == _sample_rate_list_action) + const shared_ptr device = get_selected_device(); + if (!device) + return; + + assert(!_updating_sample_count); + _updating_sample_count = true; + + if (_sample_count_supported) { - for (int i = 0; i < _sample_rate_list.count(); i++) - if (samplerate == _sample_rate_list.itemData( - i).value()) - _sample_rate_list.setCurrentIndex(i); + uint64_t sample_count = _sample_count.value(); + uint64_t min_sample_count = 0; + uint64_t max_sample_count = MaxSampleCount; + + if (sample_count == 0) + sample_count = DefaultSampleCount; + + try { + auto gvar = device->config_list(ConfigKey::LIMIT_SAMPLES); + g_variant_get(gvar.gobj(), "(tt)", + &min_sample_count, &max_sample_count); + } catch (Error error) {} + + min_sample_count = min(max(min_sample_count, MinSampleCount), + max_sample_count); + + _sample_count.show_125_list( + min_sample_count, max_sample_count); + + try { + auto gvar = device->config_get(ConfigKey::LIMIT_SAMPLES); + sample_count = g_variant_get_uint64(gvar.gobj()); + if (sample_count == 0) + sample_count = DefaultSampleCount; + sample_count = min(max(sample_count, MinSampleCount), + max_sample_count); + } catch (Error error) {} + + _sample_count.set_value(sample_count); } + else + _sample_count.show_none(); + + _updating_sample_count = false; } -void SamplingBar::commit_sample_rate() +void SamplingBar::update_device_config_widgets() { - uint64_t sample_rate = 0; + using namespace pv::popups; + + const shared_ptr device = get_selected_device(); + if (!device) + return; + + // Update the configure popup + DeviceOptions *const opts = new DeviceOptions(device, this); + _configure_button_action->setVisible( + !opts->binding().properties().empty()); + _configure_button.set_popup(opts); + + // Update the channels popup + Channels *const channels = new Channels(_session, this); + _channels_button.set_popup(channels); + + // Update supported options. + _sample_count_supported = false; + + try { + for (auto entry : device->config_keys(ConfigKey::DEVICE_OPTIONS)) + { + auto key = entry.first; + auto capabilities = entry.second; + switch (key->id()) { + case SR_CONF_LIMIT_SAMPLES: + if (capabilities.count(Capability::SET)) + _sample_count_supported = true; + break; + case SR_CONF_LIMIT_FRAMES: + if (capabilities.count(Capability::SET)) + { + device->config_set(ConfigKey::LIMIT_FRAMES, + Glib::Variant::create(1)); + on_config_changed(); + } + break; + default: + break; + } + } + } catch (Error error) {} + + // Add notification of reconfigure events + disconnect(this, SLOT(on_config_changed())); + connect(&opts->binding(), SIGNAL(config_changed()), + this, SLOT(on_config_changed())); - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); + // Update sweep timing widgets. + update_sample_count_selector(); + update_sample_rate_selector(); +} + +void SamplingBar::commit_sample_count() +{ + uint64_t sample_count = 0; + + if (_updating_sample_count) + return; + + const shared_ptr device = get_selected_device(); + if (!device) + return; - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); + sample_count = _sample_count.value(); - if (_sample_rate_action == _sample_rate_value_action) - sample_rate = (uint64_t)_sample_rate_value.value(); - else if (_sample_rate_action == _sample_rate_list_action) + // Set the sample count + assert(!_updating_sample_count); + _updating_sample_count = true; + if (_sample_count_supported) { - const int index = _sample_rate_list.currentIndex(); - if (index >= 0) - sample_rate = _sample_rate_list.itemData( - index).value(); + try { + device->config_set(ConfigKey::LIMIT_SAMPLES, + Glib::Variant::create(sample_count)); + on_config_changed(); + } catch (Error error) { + qDebug() << "Failed to configure sample count."; + return; + } } + _updating_sample_count = false; +} +void SamplingBar::commit_sample_rate() +{ + uint64_t sample_rate = 0; + + if (_updating_sample_rate) + return; + + const shared_ptr device = get_selected_device(); + if (!device) + return; + + sample_rate = _sample_rate.value(); if (sample_rate == 0) return; // Set the samplerate - if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE, - g_variant_new_uint64(sample_rate)) != SR_OK) { + assert(!_updating_sample_rate); + _updating_sample_rate = true; + try { + device->config_set(ConfigKey::SAMPLERATE, + Glib::Variant::create(sample_rate)); + on_config_changed(); + } catch (Error error) { qDebug() << "Failed to configure samplerate."; return; } + _updating_sample_rate = false; } void SamplingBar::on_device_selected() { - using namespace pv::popups; - if (_updating_device_selector) return; - update_sample_rate_selector(); + shared_ptr device = get_selected_device(); + if (!device) + return; - sr_dev_inst *const sdi = get_selected_device(); - _session.set_device(sdi); + _session.set_device(device); - // 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_device_config_widgets(); +} - // Update the probes popup - Probes *const probes = new Probes(_session, this); - _probes_button.set_popup(probes); +void SamplingBar::on_sample_count_changed() +{ + commit_sample_count(); } void SamplingBar::on_sample_rate_changed() @@ -331,9 +439,34 @@ void SamplingBar::on_sample_rate_changed() void SamplingBar::on_run_stop() { + commit_sample_count(); commit_sample_rate(); run_stop(); } +void SamplingBar::on_config_changed() +{ + commit_sample_count(); + update_sample_count_selector(); + commit_sample_rate(); + update_sample_rate_selector(); +} + +bool SamplingBar::eventFilter(QObject *watched, QEvent *event) +{ + if ((watched == &_sample_count || watched == &_sample_rate) && + (event->type() == QEvent::ToolTip)) { + double sec = (double)_sample_count.value() / _sample_rate.value(); + QHelpEvent *help_event = static_cast(event); + + QString str = tr("Total sampling time: %1").arg(pv::util::format_second(sec)); + QToolTip::showText(help_event->globalPos(), str); + + return true; + } + + return false; +} + } // namespace toolbars } // namespace pv