SamplingBar: Show a 1-2-5 for min-max sample rate values

[pulseview.git] / pv / toolbars / samplingbar.cpp

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 15eaf3b488d481f5fd5b1a6e599a692332093518..79dd7a1a37a68e4c5790171b409fdf66242e8808 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -160,9 +160,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"))))
@@ -208,24 +227,6 @@ void SamplingBar::update_sample_count_selector()
 
        assert(sdi);
 
-       _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++)
-               {
-                       if (options[i] == SR_CONF_LIMIT_SAMPLES)
-                       {
-                               _sample_count_supported = true;
-                               break;
-                       }
-               }
-       }
-
        if (_sample_count_supported)
                _sample_count.show_min_max_step(0, UINT64_MAX, 1);
        else
@@ -281,6 +282,8 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
+       GVariant *gvar;
+
        using namespace pv::popups;
 
        if (_updating_device_selector)
@@ -299,6 +302,29 @@ 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();