X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=af5afb0c27774b980ae843c68e73a81b6e135217;hp=dce7aa38417753c7927f3eefa0c23cd0369b7ae4;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hpb=3cbffdcf7c99c9722f9ba7b8b9e483c2f6132b68 diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index dce7aa38..af5afb0c 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -22,10 +22,10 @@ #include -#include - #include #include +#include +#include #include "samplingbar.h" @@ -33,11 +33,12 @@ #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 { @@ -93,27 +94,44 @@ 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)); } + // The selected device should have been in the list + assert(selected_index != -1); + _device_selector.setCurrentIndex(selected_index); + + update_device_config_widgets(); + _updating_device_selector = false; } @@ -128,28 +146,13 @@ shared_ptr SamplingBar::get_selected_device() const 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((*iter).second); } -void SamplingBar::set_selected_device(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()) { - // Calling this leads to on_device_selected being - // invoked, which updates the sampling bar widgets. - _device_selector.setCurrentIndex(i); - return; - } -} - void SamplingBar::set_capture_state(pv::SigSession::capture_state state) { const QIcon *icons[] = {&_icon_grey, &_icon_red, &_icon_green}; @@ -303,6 +306,59 @@ 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; @@ -356,10 +412,6 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_device_selected() { - GVariant *gvar; - - using namespace pv::popups; - if (_updating_device_selector) return; @@ -369,47 +421,7 @@ void SamplingBar::on_device_selected() _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 ((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(); + update_device_config_widgets(); } void SamplingBar::on_sample_count_changed() @@ -437,5 +449,21 @@ void SamplingBar::on_config_changed() 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