]> sigrok.org Git - pulseview.git/blobdiff - pv/toolbars/samplingbar.cpp
Ported to new SR_CONF_LIMIT_SAMPLES config key
[pulseview.git] / pv / toolbars / samplingbar.cpp
index 06c47fd3efa5f40b4369b75cccfc673bd8cde431..04aba21ab0f1ee7ab02f6468f9be9b504351043d 100644 (file)
 #include <pv/popups/deviceoptions.h>
 #include <pv/popups/probes.h>
 
+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),
@@ -73,9 +54,11 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
        _configure_button(this),
        _configure_button_action(NULL),
        _probes_button(this),
-       _record_length_selector(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"),
@@ -85,20 +68,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()));
 
-       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::fromUtf8(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);
 
@@ -113,7 +88,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
        addWidget(&_device_selector);
        _configure_button_action = addWidget(&_configure_button);
        addWidget(&_probes_button);
-       addWidget(&_record_length_selector);
+       addWidget(&_sample_count);
        addWidget(&_sample_rate);
 
        addWidget(&_run_stop_button);
@@ -156,15 +131,6 @@ void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi)
                }
 }
 
-uint64_t SamplingBar::get_record_length() const
-{
-       const int index = _record_length_selector.currentIndex();
-       if (index < 0)
-               return 0;
-
-       return _record_length_selector.itemData(index).value<uint64_t>();
-}
-
 void SamplingBar::set_capture_state(pv::SigSession::capture_state state)
 {
        const QIcon *icons[] = {&_icon_grey, &_icon_red, &_icon_green};
@@ -198,9 +164,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"))))
@@ -238,6 +223,71 @@ void SamplingBar::update_sample_rate_selector_value()
        _updating_sample_rate = false;
 }
 
+void SamplingBar::update_sample_count_selector()
+{
+       sr_dev_inst *const sdi = get_selected_device();
+       GVariant *gvar;
+
+       assert(sdi);
+
+       _updating_sample_count = true;
+
+       if (_sample_count_supported)
+       {
+               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);
+
+               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);
+
+                       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();
+       assert(sdi);
+
+       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) {
+               qDebug() << "Failed to configure sample count.";
+               return;
+       }
+}
+
 void SamplingBar::commit_sample_rate()
 {
        uint64_t sample_rate = 0;
@@ -259,13 +309,13 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
+       GVariant *gvar;
+
        using namespace pv::popups;
 
        if (_updating_device_selector)
                return;
 
-       update_sample_rate_selector();
-
        sr_dev_inst *const sdi = get_selected_device();
        _session.set_device(sdi);
 
@@ -278,6 +328,39 @@ void SamplingBar::on_device_selected()
        // Update the probes popup
        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();
+}
+
+void SamplingBar::on_sample_count_changed()
+{
+       if(!_updating_sample_count)
+               commit_sample_count();
 }
 
 void SamplingBar::on_sample_rate_changed()
@@ -288,6 +371,7 @@ void SamplingBar::on_sample_rate_changed()
 
 void SamplingBar::on_run_stop()
 {
+       commit_sample_count();
        commit_sample_rate();   
        run_stop();
 }