X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=59d190d427792db64221feb338d166257dfbe2ec;hp=987719d8c2f45cfa37db50a03b95c7e34bcbf70d;hb=19adbc2c342b190161ec1223377a3619974b91f7;hpb=6546a6a70c9da402794297cbdc9aba67854a4037 diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 987719d8..59d190d4 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -32,15 +32,22 @@ #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), @@ -91,14 +98,20 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : } void SamplingBar::set_device_list( - const std::list &devices) + const std::list< shared_ptr > &devices) { _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); + + _device_selector_map[sdi] = dev_inst; _device_selector.addItem(title.c_str(), qVariantFromValue((void*)sdi)); } @@ -108,20 +121,32 @@ void SamplingBar::set_device_list( on_device_selected(); } -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(); + + const sr_dev_inst *const sdi = + (const sr_dev_inst*)_device_selector.itemData( + index).value(); + assert(sdi); - return (sr_dev_inst*)_device_selector.itemData( - index).value(); + 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_selected_device(struct sr_dev_inst *const sdi) +void SamplingBar::set_selected_device(boost::shared_ptr dev_inst) { + assert(dev_inst); + for (int i = 0; i < _device_selector.count(); i++) - if (sdi == _device_selector.itemData(i).value()) { + if (dev_inst->dev_inst() == + _device_selector.itemData(i).value()) { _device_selector.setCurrentIndex(i); return; } @@ -137,14 +162,17 @@ 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) + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) return; + const sr_dev_inst *const sdi = dev_inst->dev_inst(); + assert(sdi); + _updating_sample_rate = true; if (sr_config_list(sdi->driver, sdi, NULL, @@ -160,9 +188,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")))) @@ -180,10 +227,14 @@ 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; + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + + const sr_dev_inst *const sdi = dev_inst->dev_inst(); assert(sdi); if (sr_config_get(sdi->driver, sdi, NULL, @@ -202,37 +253,65 @@ 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; + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + + const sr_dev_inst *const sdi = dev_inst->dev_inst(); assert(sdi); - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_LIMIT_SAMPLES, &gvar) != SR_OK) - { - _sample_count_supported = false; - _sample_count.show_none(); - } - else + _updating_sample_count = true; + + if (_sample_count_supported) { - _sample_count_supported = true; - _sample_count.show_min_max_step(0, UINT64_MAX, 1); + uint64_t sample_count = DefaultSampleCount; + 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) { + 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); - samplecount = g_variant_get_uint64(gvar); - g_variant_unref(gvar); + if (sr_config_get(sdi->driver, sdi, NULL, + SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) + { + sample_count = g_variant_get_uint64(gvar); + if (sample_count == 0) + sample_count = DefaultSampleCount; + sample_count = min(max(sample_count, MinSampleCount), + max_sample_count); - _updating_sample_count = true; - _sample_count.set_value(samplecount); - _updating_sample_count = false; + g_variant_unref(gvar); + } + + _sample_count.set_value(sample_count); } + else + _sample_count.show_none(); + + _updating_sample_count = false; } void SamplingBar::commit_sample_count() { uint64_t sample_count = 0; - sr_dev_inst *const sdi = 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); sample_count = _sample_count.value(); @@ -249,7 +328,11 @@ void SamplingBar::commit_sample_rate() { uint64_t sample_rate = 0; - sr_dev_inst *const sdi = 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); sample_rate = _sample_rate.value(); @@ -266,16 +349,24 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_device_selected() { + GVariant *gvar; + using namespace pv::popups; if (_updating_device_selector) return; - sr_dev_inst *const sdi = get_selected_device(); - _session.set_device(sdi); + 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(sdi, this); + DeviceOptions *const opts = new DeviceOptions(dev_inst, this); _configure_button_action->setVisible( !opts->binding().properties().empty()); _configure_button.set_popup(opts); @@ -284,14 +375,32 @@ void SamplingBar::on_device_selected() 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(); - - if (_sample_count_supported && _sample_count.value() == 0) { - _sample_count.set_value(DefaultRecordLength); - commit_sample_count(); - } } void SamplingBar::on_sample_count_changed() @@ -308,6 +417,7 @@ void SamplingBar::on_sample_rate_changed() void SamplingBar::on_run_stop() { + commit_sample_count(); commit_sample_rate(); run_stop(); }