X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=085e0430582e08b5ff488b7b1d2a708ef35bca35;hp=be29e74bb534643183fd739e5d1785f63f974e22;hb=62974f456595f3f6b9804a8f0fb993b4766d61e7;hpb=3668e2fe35956801bc3f89de2dabcddf98e19179 diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index be29e74b..085e0430 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -26,6 +26,8 @@ #include #include +#include +#include #include "samplingbar.h" @@ -33,6 +35,7 @@ #include #include #include +#include using boost::shared_ptr; using std::map; @@ -93,11 +96,19 @@ 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(); @@ -109,11 +120,20 @@ void SamplingBar::set_device_list( 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; } @@ -136,20 +156,6 @@ shared_ptr SamplingBar::get_selected_device() const 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}; @@ -264,10 +270,13 @@ void SamplingBar::update_sample_count_selector() 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 (sample_count == 0) + sample_count = DefaultSampleCount; + if ((gvar = dev_inst->list_config(NULL, SR_CONF_LIMIT_SAMPLES))) { g_variant_get(gvar, "(tt)", @@ -300,6 +309,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; @@ -353,10 +415,6 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_device_selected() { - GVariant *gvar; - - using namespace pv::popups; - if (_updating_device_selector) return; @@ -366,47 +424,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() @@ -434,5 +452,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