]> sigrok.org Git - pulseview.git/blobdiff - pv/toolbars/samplingbar.cpp
No longer need to set sample limit on session start.
[pulseview.git] / pv / toolbars / samplingbar.cpp
index b80d6f80f0df737811aeb6c24c2132b11b77d613..914083c3c0a50ea1968caffa21cd8ee23e9ad248 100644 (file)
 
 #include <pv/devicemanager.h>
 #include <pv/popups/deviceoptions.h>
+#include <pv/popups/probes.h>
 
-using namespace std;
+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) :
@@ -70,10 +48,12 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
        _device_selector(this),
        _updating_device_selector(false),
        _configure_button(this),
+       _configure_button_action(NULL),
        _probes_button(this),
-       _probes_popup(_session, this),
-       _record_length_selector(this),
-       _sample_rate_list(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"),
@@ -83,21 +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()));
 
-       _sample_rate_value.setDecimals(0);
-       _sample_rate_value.setSuffix("Hz");
-
-       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(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);
 
@@ -106,22 +77,16 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 
        _probes_button.setIcon(QIcon::fromTheme("probes",
                QIcon(":/icons/probes.svg")));
-       _probes_button.set_popup(&_probes_popup);
 
        _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
        addWidget(&_device_selector);
-       addWidget(&_configure_button);
+       _configure_button_action = addWidget(&_configure_button);
        addWidget(&_probes_button);
-       addWidget(&_record_length_selector);
-       _sample_rate_list_action = addWidget(&_sample_rate_list);
-       _sample_rate_value_action = addWidget(&_sample_rate_value);
-       addWidget(&_run_stop_button);
+       addWidget(&_sample_count);
+       addWidget(&_sample_rate);
 
-       connect(&_sample_rate_list, SIGNAL(currentIndexChanged(int)),
-               this, SLOT(on_sample_rate_changed()));
-       connect(&_sample_rate_value, SIGNAL(editingFinished()),
-               this, SLOT(on_sample_rate_changed()));
+       addWidget(&_run_stop_button);
 }
 
 void SamplingBar::set_device_list(
@@ -161,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};
@@ -184,59 +140,41 @@ void SamplingBar::update_sample_rate_selector()
        GVariant *gvar_dict, *gvar_list;
        const uint64_t *elements = NULL;
        gsize num_elements;
-       QAction *selector_action = NULL;
-
-       assert(_sample_rate_value_action);
-       assert(_sample_rate_list_action);
 
        if (!sdi)
                return;
 
-       if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
-                       &gvar_dict, sdi) != SR_OK)
-               return;
+       _updating_sample_rate = true;
 
-       _sample_rate_list_action->setVisible(false);
-       _sample_rate_value_action->setVisible(false);
+       if (sr_config_list(sdi->driver, sdi, NULL,
+                       SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK)
+       {
+               _sample_rate.show_none();
+               _updating_sample_rate = false;
+               return;
+       }
 
        if ((gvar_list = g_variant_lookup_value(gvar_dict,
-                       "samplerate-steps", G_VARIANT_TYPE("at")))) {
+                       "samplerate-steps", G_VARIANT_TYPE("at"))))
+       {
                elements = (const uint64_t *)g_variant_get_fixed_array(
                                gvar_list, &num_elements, sizeof(uint64_t));
-               _sample_rate_value.setRange(elements[0], elements[1]);
-               _sample_rate_value.setSingleStep(elements[2]);
+               _sample_rate.show_min_max_step(elements[0], elements[1],
+                       elements[2]);
                g_variant_unref(gvar_list);
-
-               selector_action = _sample_rate_value_action;
        }
        else if ((gvar_list = g_variant_lookup_value(gvar_dict,
                        "samplerates", G_VARIANT_TYPE("at"))))
        {
                elements = (const uint64_t *)g_variant_get_fixed_array(
                                gvar_list, &num_elements, sizeof(uint64_t));
-               _sample_rate_list.clear();
-
-               for (unsigned int i = 0; i < num_elements; i++)
-               {
-                       char *const s = sr_samplerate_string(elements[i]);
-                       _sample_rate_list.addItem(QString(s),
-                               qVariantFromValue(elements[i]));
-                       g_free(s);
-               }
-
-               _sample_rate_list.show();
+               _sample_rate.show_list(elements, num_elements);
                g_variant_unref(gvar_list);
-
-               selector_action = _sample_rate_list_action;
        }
+       _updating_sample_rate = false;
 
        g_variant_unref(gvar_dict);
        update_sample_rate_selector_value();
-
-       // We delay showing the action, so that value change events
-       // are ignored.
-       if (selector_action)
-               selector_action->setVisible(true);
 }
 
 void SamplingBar::update_sample_rate_selector_value()
@@ -247,8 +185,8 @@ void SamplingBar::update_sample_rate_selector_value()
 
        assert(sdi);
 
-       if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-               &gvar, sdi) != SR_OK) {
+       if (sr_config_get(sdi->driver, sdi, NULL,
+               SR_CONF_SAMPLERATE, &gvar) != SR_OK) {
                qDebug() <<
                                "WARNING: Failed to get value of sample rate";
                return;
@@ -256,45 +194,67 @@ void SamplingBar::update_sample_rate_selector_value()
        samplerate = g_variant_get_uint64(gvar);
        g_variant_unref(gvar);
 
-       assert(_sample_rate_value_action);
-       assert(_sample_rate_list_action);
+       _updating_sample_rate = true;
+       _sample_rate.set_value(samplerate);
+       _updating_sample_rate = false;
+}
 
-       if (_sample_rate_value_action->isVisible())
-               _sample_rate_value.setValue(samplerate);
-       else if (_sample_rate_list_action->isVisible())
+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)
        {
-               for (int i = 0; i < _sample_rate_list.count(); i++)
-                       if (samplerate == _sample_rate_list.itemData(
-                               i).value<uint64_t>())
-                               _sample_rate_list.setCurrentIndex(i);
+               _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_rate()
+void SamplingBar::commit_sample_count()
 {
-       uint64_t sample_rate = 0;
+       uint64_t sample_count = 0;
 
        sr_dev_inst *const sdi = get_selected_device();
        assert(sdi);
 
-       assert(_sample_rate_value_action);
-       assert(_sample_rate_list_action);
+       sample_count = _sample_count.value();
 
-       if (_sample_rate_value_action->isVisible())
-               sample_rate = (uint64_t)_sample_rate_value.value();
-       else if (_sample_rate_list_action->isVisible())
-       {
-               const int index = _sample_rate_list.currentIndex();
-               if (index >= 0)
-                       sample_rate = _sample_rate_list.itemData(
-                               index).value<uint64_t>();
+       // 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;
+
+       sr_dev_inst *const sdi = get_selected_device();
+       assert(sdi);
+
+       sample_rate = _sample_rate.value();
        if (sample_rate == 0)
                return;
 
        // Set the samplerate
-       if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
+       if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE,
                g_variant_new_uint64(sample_rate)) != SR_OK) {
                qDebug() << "Failed to configure samplerate.";
                return;
@@ -308,17 +268,36 @@ 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);
 
-       _configure_button.set_popup(new DeviceOptions(sdi, this));
+       // Update the configure popup
+       DeviceOptions *const opts = new DeviceOptions(sdi, this);
+       _configure_button_action->setVisible(
+               !opts->binding().properties().empty());
+       _configure_button.set_popup(opts);
+
+       // Update the probes popup
+       Probes *const probes = new Probes(_session, this);
+       _probes_button.set_popup(probes);
+}
+
+void SamplingBar::on_sample_count_changed()
+{
+       if(!_updating_sample_count)
+               commit_sample_count();
 }
 
 void SamplingBar::on_sample_rate_changed()
 {
-       commit_sample_rate();
+       if (!_updating_sample_rate)
+               commit_sample_rate();
 }
 
 void SamplingBar::on_run_stop()