X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=af5afb0c27774b980ae843c68e73a81b6e135217;hp=59d190d427792db64221feb338d166257dfbe2ec;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hpb=19adbc2c342b190161ec1223377a3619974b91f7 diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 59d190d4..af5afb0c 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -22,24 +22,23 @@ #include -#include - -#include - #include #include +#include +#include #include "samplingbar.h" #include -#include +#include #include #include +#include -using boost::shared_ptr; using std::map; using std::max; using std::min; +using std::shared_ptr; using std::string; namespace pv { @@ -95,61 +94,63 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : addWidget(&_sample_rate); addWidget(&_run_stop_button); + + _sample_count.installEventFilter(this); + _sample_rate.installEventFilter(this); } void SamplingBar::set_device_list( - const std::list< shared_ptr > &devices) + const std::list< shared_ptr > &devices, + shared_ptr selected) { + int selected_index = -1; + + assert(selected); + _updating_device_selector = true; _device_selector.clear(); _device_selector_map.clear(); - BOOST_FOREACH (shared_ptr dev_inst, devices) { + for (shared_ptr dev_inst : devices) { assert(dev_inst); const string title = dev_inst->format_device_title(); const sr_dev_inst *sdi = dev_inst->dev_inst(); assert(sdi); + if (selected == dev_inst) + selected_index = _device_selector.count(); + _device_selector_map[sdi] = dev_inst; _device_selector.addItem(title.c_str(), qVariantFromValue((void*)sdi)); } - _updating_device_selector = false; + // The selected device should have been in the list + assert(selected_index != -1); + _device_selector.setCurrentIndex(selected_index); - on_device_selected(); + update_device_config_widgets(); + + _updating_device_selector = false; } -shared_ptr SamplingBar::get_selected_device() const +shared_ptr SamplingBar::get_selected_device() const { const int index = _device_selector.currentIndex(); if (index < 0) - return shared_ptr(); + return shared_ptr(); const sr_dev_inst *const sdi = (const sr_dev_inst*)_device_selector.itemData( index).value(); assert(sdi); - map >:: - const_iterator iter = _device_selector_map.find(sdi); + const auto iter = _device_selector_map.find(sdi); if (iter == _device_selector_map.end()) - return shared_ptr(); + return shared_ptr(); - return shared_ptr((*iter).second); -} - -void SamplingBar::set_selected_device(boost::shared_ptr dev_inst) -{ - assert(dev_inst); - - for (int i = 0; i < _device_selector.count(); i++) - if (dev_inst->dev_inst() == - _device_selector.itemData(i).value()) { - _device_selector.setCurrentIndex(i); - return; - } + return shared_ptr((*iter).second); } void SamplingBar::set_capture_state(pv::SigSession::capture_state state) @@ -166,17 +167,17 @@ void SamplingBar::update_sample_rate_selector() const uint64_t *elements = NULL; gsize num_elements; - const shared_ptr dev_inst = get_selected_device(); - if (!dev_inst) + if (_updating_sample_rate) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + assert(!_updating_sample_rate); _updating_sample_rate = true; - if (sr_config_list(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK) + if (!(gvar_dict = dev_inst->list_config(NULL, SR_CONF_SAMPLERATE))) { _sample_rate.show_none(); _updating_sample_rate = false; @@ -230,22 +231,21 @@ void SamplingBar::update_sample_rate_selector_value() GVariant *gvar; uint64_t samplerate; - const shared_ptr dev_inst = get_selected_device(); - if (!dev_inst) + if (_updating_sample_rate) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar) != SR_OK) { - qDebug() << - "WARNING: Failed to get value of sample rate"; + if (!(gvar = dev_inst->get_config(NULL, SR_CONF_SAMPLERATE))) { + qDebug() << "WARNING: Failed to get value of sample rate"; return; } samplerate = g_variant_get_uint64(gvar); g_variant_unref(gvar); + assert(!_updating_sample_rate); _updating_sample_rate = true; _sample_rate.set_value(samplerate); _updating_sample_rate = false; @@ -255,23 +255,27 @@ void SamplingBar::update_sample_count_selector() { GVariant *gvar; - const shared_ptr dev_inst = get_selected_device(); - if (!dev_inst) + if (_updating_sample_count) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + assert(!_updating_sample_count); _updating_sample_count = true; if (_sample_count_supported) { - uint64_t sample_count = DefaultSampleCount; + uint64_t sample_count = _sample_count.value(); uint64_t min_sample_count = 0; uint64_t max_sample_count = MaxSampleCount; - if (sr_config_list(sdi->driver, sdi, NULL, - SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) { + if (sample_count == 0) + sample_count = DefaultSampleCount; + + if ((gvar = dev_inst->list_config(NULL, SR_CONF_LIMIT_SAMPLES))) + { g_variant_get(gvar, "(tt)", &min_sample_count, &max_sample_count); g_variant_unref(gvar); @@ -283,8 +287,7 @@ void SamplingBar::update_sample_count_selector() _sample_count.show_125_list( min_sample_count, max_sample_count); - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) + if ((gvar = dev_inst->get_config(NULL, SR_CONF_LIMIT_SAMPLES))) { sample_count = g_variant_get_uint64(gvar); if (sample_count == 0) @@ -303,116 +306,132 @@ void SamplingBar::update_sample_count_selector() _updating_sample_count = false; } +void SamplingBar::update_device_config_widgets() +{ + GVariant *gvar; + + using namespace pv::popups; + + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + + // Update the configure popup + DeviceOptions *const opts = new DeviceOptions(dev_inst, 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 supported options. + _sample_count_supported = false; + + if ((gvar = dev_inst->list_config(NULL, SR_CONF_DEVICE_OPTIONS))) + { + gsize num_opts; + const int *const options = + (const int32_t *)g_variant_get_fixed_array( + gvar, &num_opts, sizeof(int32_t)); + for (unsigned int i = 0; i < num_opts; i++) + { + switch (options[i]) { + case SR_CONF_LIMIT_SAMPLES: + _sample_count_supported = true; + break; + case SR_CONF_LIMIT_FRAMES: + dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES, + g_variant_new_uint64(1)); + break; + } + } + } + + // Add notification of reconfigure events + disconnect(this, SLOT(on_config_changed())); + connect(dev_inst.get(), SIGNAL(config_changed()), + this, SLOT(on_config_changed())); + + // Update sweep timing widgets. + update_sample_count_selector(); + update_sample_rate_selector(); +} + void SamplingBar::commit_sample_count() { uint64_t sample_count = 0; - const shared_ptr dev_inst = get_selected_device(); - if (!dev_inst) + if (_updating_sample_count) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; sample_count = _sample_count.value(); // Set the sample count - if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, - g_variant_new_uint64(sample_count)) != SR_OK) { + assert(!_updating_sample_count); + _updating_sample_count = true; + if (_sample_count_supported && + !dev_inst->set_config(NULL, SR_CONF_LIMIT_SAMPLES, + g_variant_new_uint64(sample_count))) { qDebug() << "Failed to configure sample count."; return; } + _updating_sample_count = false; } void SamplingBar::commit_sample_rate() { uint64_t sample_rate = 0; - const shared_ptr dev_inst = get_selected_device(); - if (!dev_inst) + if (_updating_sample_rate) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + 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; + if (!dev_inst->set_config(NULL, SR_CONF_SAMPLERATE, + g_variant_new_uint64(sample_rate))) { qDebug() << "Failed to configure samplerate."; return; } + _updating_sample_rate = false; } void SamplingBar::on_device_selected() { - GVariant *gvar; - - using namespace pv::popups; - if (_updating_device_selector) return; - const shared_ptr dev_inst = get_selected_device(); + const shared_ptr dev_inst = get_selected_device(); if (!dev_inst) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); - _session.set_device(dev_inst); - // Update the configure popup - DeviceOptions *const opts = new DeviceOptions(dev_inst, 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 supported options. - _sample_count_supported = false; - - if (sr_config_list(sdi->driver, sdi, NULL, - SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK) - { - gsize num_opts; - const int *const options = (const int32_t *)g_variant_get_fixed_array( - gvar, &num_opts, sizeof(int32_t)); - for (unsigned int i = 0; i < num_opts; i++) - { - switch (options[i]) { - case SR_CONF_LIMIT_SAMPLES: - _sample_count_supported = true; - break; - case SR_CONF_LIMIT_FRAMES: - sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, - g_variant_new_uint64(1)); - break; - } - } - } - - // Update sweep timing widgets. - update_sample_count_selector(); - update_sample_rate_selector(); + update_device_config_widgets(); } void SamplingBar::on_sample_count_changed() { - if(!_updating_sample_count) - commit_sample_count(); + commit_sample_count(); } void SamplingBar::on_sample_rate_changed() { - if (!_updating_sample_rate) - commit_sample_rate(); + commit_sample_rate(); } void SamplingBar::on_run_stop() @@ -422,5 +441,29 @@ void SamplingBar::on_run_stop() 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