X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=91c4b076ea6346d46102100ec20eec4a0c201756;hp=9e16c5119384f208f12f7760cb2c06dcca373d04;hb=e95e8563a1de0d2045cb8f30083889896b6c94df;hpb=df5396800830d41a83a837b95b0f3787571905cf diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 9e16c511..91c4b076 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -24,23 +24,28 @@ #include -#include - #include #include #include "samplingbar.h" #include +#include #include #include +using boost::shared_ptr; +using std::map; +using std::max; +using std::min; using std::string; namespace pv { namespace toolbars { -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), @@ -54,6 +59,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : _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"), @@ -90,40 +96,58 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : } void SamplingBar::set_device_list( - const std::list &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 (sr_dev_inst *sdi, devices) { - const string title = DeviceManager::format_device_title(sdi); + BOOST_FOREACH (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; } -struct sr_dev_inst* SamplingBar::get_selected_device() const +shared_ptr SamplingBar::get_selected_device() const { const int index = _device_selector.currentIndex(); if (index < 0) - return NULL; + return shared_ptr(); - return (sr_dev_inst*)_device_selector.itemData( - index).value(); -} + const sr_dev_inst *const sdi = + (const sr_dev_inst*)_device_selector.itemData( + index).value(); + assert(sdi); -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; - } + map >:: + const_iterator iter = _device_selector_map.find(sdi); + if (iter == _device_selector_map.end()) + return shared_ptr(); + + return shared_ptr((*iter).second); } void SamplingBar::set_capture_state(pv::SigSession::capture_state state) @@ -136,18 +160,21 @@ void SamplingBar::set_capture_state(pv::SigSession::capture_state state) void SamplingBar::update_sample_rate_selector() { - const sr_dev_inst *const sdi = get_selected_device(); GVariant *gvar_dict, *gvar_list; const uint64_t *elements = NULL; gsize num_elements; - if (!sdi) + if (_updating_sample_rate) + return; + + 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; @@ -159,9 +186,28 @@ void SamplingBar::update_sample_rate_selector() { 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]); + + const uint64_t min = elements[0]; + const uint64_t max = elements[1]; + const uint64_t step = elements[2]; + g_variant_unref(gvar_list); + + 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, "samplerates", G_VARIANT_TYPE("at")))) @@ -179,21 +225,24 @@ void SamplingBar::update_sample_rate_selector() void SamplingBar::update_sample_rate_selector_value() { - sr_dev_inst *const sdi = get_selected_device(); GVariant *gvar; uint64_t samplerate; - assert(sdi); + if (_updating_sample_rate) + return; - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar) != SR_OK) { - qDebug() << - "WARNING: Failed to get value of sample rate"; + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + + 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; @@ -201,111 +250,201 @@ void SamplingBar::update_sample_rate_selector_value() void SamplingBar::update_sample_count_selector() { - sr_dev_inst *const sdi = get_selected_device(); GVariant *gvar; - uint64_t samplecount; - assert(sdi); + if (_updating_sample_count) + return; + + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_LIMIT_SAMPLES, &gvar) != SR_OK) + assert(!_updating_sample_count); + _updating_sample_count = true; + + if (_sample_count_supported) { - _sample_count.show_none(); + 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)", + &min_sample_count, &max_sample_count); + g_variant_unref(gvar); + } + + min_sample_count = min(max(min_sample_count, MinSampleCount), + max_sample_count); + + _sample_count.show_125_list( + min_sample_count, max_sample_count); + + if ((gvar = dev_inst->get_config(NULL, SR_CONF_LIMIT_SAMPLES))) + { + sample_count = g_variant_get_uint64(gvar); + if (sample_count == 0) + sample_count = DefaultSampleCount; + sample_count = min(max(sample_count, MinSampleCount), + max_sample_count); + + g_variant_unref(gvar); + } + + _sample_count.set_value(sample_count); } else - { - _sample_count.show_min_max_step(0, UINT64_MAX, 1); + _sample_count.show_none(); + + _updating_sample_count = false; +} - samplecount = g_variant_get_uint64(gvar); - g_variant_unref(gvar); +void SamplingBar::update_device_config_widgets() +{ + GVariant *gvar; - _updating_sample_count = true; - _sample_count.set_value(samplecount); - _updating_sample_count = false; + 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; - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); + if (_updating_sample_count) + return; + + 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; - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); + if (_updating_sample_rate) + return; + + 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() { - 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); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; - // Update sweep timing widgets. - update_sample_count_selector(); - update_sample_rate_selector(); + _session.set_device(dev_inst); - if (_sample_count.value() == 0) - _sample_count.set_value(DefaultRecordLength); + 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() { + 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(); +} + } // namespace toolbars } // namespace pv