No longer need to set sample limit on session start.

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

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 06c47fd3efa5f40b4369b75cccfc673bd8cde431..914083c3c0a50ea1968caffa21cd8ee23e9ad248 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -40,29 +40,6 @@ 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;
 
 SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
@@ -73,9 +50,10 @@ 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),
        _icon_red(":/icons/status-red.svg"),
        _icon_green(":/icons/status-green.svg"),
        _icon_grey(":/icons/status-grey.svg"),
@@ -85,20 +63,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 +83,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 +126,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};
@@ -238,6 +199,49 @@ 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;
+       uint64_t samplecount;
+
+       assert(sdi);
+
+       if (sr_config_get(sdi->driver, sdi, NULL,
+               SR_CONF_LIMIT_SAMPLES, &gvar) != SR_OK)
+       {
+               _sample_count.show_none();
+       }
+       else
+       {
+               _sample_count.show_min_max_step(0, UINT64_MAX, 1);
+
+               samplecount = g_variant_get_uint64(gvar);
+               g_variant_unref(gvar);
+
+               _updating_sample_count = true;
+               _sample_count.set_value(samplecount);
+               _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;
@@ -264,8 +268,12 @@ void SamplingBar::on_device_selected()
        if (_updating_device_selector)
                return;
 
+       update_sample_count_selector();
        update_sample_rate_selector();
 
+       if (_sample_count.value() == 0)
+               _sample_count.set_value(DefaultRecordLength);
+
        sr_dev_inst *const sdi = get_selected_device();
        _session.set_device(sdi);
 
@@ -280,6 +288,12 @@ void SamplingBar::on_device_selected()
        _probes_button.set_popup(probes);
 }
 
+void SamplingBar::on_sample_count_changed()
+{
+       if(!_updating_sample_count)
+               commit_sample_count();
+}
+
 void SamplingBar::on_sample_rate_changed()
 {
        if (!_updating_sample_rate)