#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::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),
{
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"))))
{
sr_dev_inst *const sdi = get_selected_device();
GVariant *gvar;
- uint64_t samplecount = 0;
assert(sdi);
- if (_sample_count_supported)
- _sample_count.show_min_max_step(0, UINT64_MAX, 1);
- else
- _sample_count.show_none();
+ _updating_sample_count = true;
- if (sr_config_get(sdi->driver, sdi, NULL,
- SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK)
+ if (_sample_count_supported)
{
- samplecount = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
+ 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 = true;
- _sample_count.set_value(samplecount);
_updating_sample_count = false;
}
// 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()
void SamplingBar::on_run_stop()
{
+ commit_sample_count();
commit_sample_rate();
run_stop();
}