X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=91c4b076ea6346d46102100ec20eec4a0c201756;hp=2fa2d3919af81048b6783ff91eb08bef9179007e;hb=e95e8563a1de0d2045cb8f30083889896b6c94df;hpb=68162c2925e3c5a3c7d0b4d3d100184e5c649eba diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 2fa2d391..91c4b076 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -24,45 +24,28 @@ #include -#include - #include #include #include "samplingbar.h" #include +#include #include +#include -using namespace std; +using boost::shared_ptr; +using std::map; +using std::max; +using std::min; +using std::string; 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), @@ -70,10 +53,13 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : _device_selector(this), _updating_device_selector(false), _configure_button(this), + _configure_button_action(NULL), _probes_button(this), - _probes_popup(_session, this), - _record_length_selector(this), - _sample_rate_list(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"), @@ -83,21 +69,12 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : 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(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); @@ -106,68 +83,71 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : _probes_button.setIcon(QIcon::fromTheme("probes", QIcon(":/icons/probes.svg"))); - _probes_button.set_popup(&_probes_popup); _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); addWidget(&_device_selector); - addWidget(&_configure_button); + _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(&_run_stop_button); + addWidget(&_sample_count); + addWidget(&_sample_rate); - 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())); + addWidget(&_run_stop_button); } 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 (sr_dev_inst*)_device_selector.itemData( - index).value(); -} + return shared_ptr(); -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; - } -} + const sr_dev_inst *const sdi = + (const sr_dev_inst*)_device_selector.itemData( + index).value(); + assert(sdi); -uint64_t SamplingBar::get_record_length() const -{ - const int index = _record_length_selector.currentIndex(); - if (index < 0) - return 0; + map >:: + const_iterator iter = _device_selector_map.find(sdi); + if (iter == _device_selector_map.end()) + return shared_ptr(); - return _record_length_selector.itemData(index).value(); + return shared_ptr((*iter).second); } void SamplingBar::set_capture_state(pv::SigSession::capture_state state) @@ -180,140 +160,270 @@ 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; - QAction *selector_action = NULL; - - 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 dev_inst = get_selected_device(); + if (!dev_inst) return; - _sample_rate_list_action->setVisible(false); - _sample_rate_value_action->setVisible(false); + assert(!_updating_sample_rate); + _updating_sample_rate = true; + + if (!(gvar_dict = dev_inst->list_config(NULL, SR_CONF_SAMPLERATE))) + { + _sample_rate.show_none(); + _updating_sample_rate = false; + return; + } if ((gvar_list = g_variant_lookup_value(gvar_dict, - "samplerate-steps", G_VARIANT_TYPE("at")))) { + "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); - selector_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, "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(s), - qVariantFromValue(elements[i])); - g_free(s); - } - - _sample_rate_list.show(); + _sample_rate.show_list(elements, num_elements); g_variant_unref(gvar_list); - - selector_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 (selector_action) - selector_action->setVisible(true); } 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; + + 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(_sample_rate_value_action); - assert(_sample_rate_list_action); + assert(!_updating_sample_rate); + _updating_sample_rate = true; + _sample_rate.set_value(samplerate); + _updating_sample_rate = false; +} + +void SamplingBar::update_sample_count_selector() +{ + GVariant *gvar; + + if (_updating_sample_count) + return; + + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; - if (_sample_rate_value_action->isVisible()) - _sample_rate_value.setValue(samplerate); - else if (_sample_rate_list_action->isVisible()) + 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; + + 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_none(); + + _updating_sample_count = false; } -void SamplingBar::commit_sample_rate() +void SamplingBar::update_device_config_widgets() { - uint64_t sample_rate = 0; + GVariant *gvar; - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); + 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); - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); + // Update the probes popup + Probes *const probes = new Probes(_session, this); + _probes_button.set_popup(probes); - if (_sample_rate_value_action->isVisible()) - sample_rate = (uint64_t)_sample_rate_value.value(); - else if (_sample_rate_list_action->isVisible()) + // Update supported options. + _sample_count_supported = false; + + if ((gvar = dev_inst->list_config(NULL, SR_CONF_DEVICE_OPTIONS))) { - const int index = _sample_rate_list.currentIndex(); - if (index >= 0) - sample_rate = _sample_rate_list.itemData( - index).value(); + 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; + + 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 + 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; + + 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; - update_sample_rate_selector(); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + + _session.set_device(dev_inst); - sr_dev_inst *const sdi = get_selected_device(); - _session.set_device(sdi); + update_device_config_widgets(); +} - _configure_button.set_popup(new DeviceOptions(sdi, this)); +void SamplingBar::on_sample_count_changed() +{ + commit_sample_count(); } void SamplingBar::on_sample_rate_changed() @@ -323,9 +433,18 @@ 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(); +} + } // namespace toolbars } // namespace pv