Populate sample rate widget with correct initial value

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

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index ae4f298b6f2eae30f744ce4636e344459b87b5c6..db7e8e0b1a1dc330397099ea0cfb63794db093a6 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -64,12 +64,16 @@ const uint64_t SamplingBar::RecordLengths[20] = {
 
 const uint64_t SamplingBar::DefaultRecordLength = 1000000;
 
-SamplingBar::SamplingBar(QWidget *parent) :
+SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
        QToolBar("Sampling Bar", parent),
+       _session(session),
        _device_selector(this),
+       _updating_device_selector(false),
        _configure_button(this),
        _probes_button(this),
+       _probes_popup(_session, this),
        _record_length_selector(this),
+       _sample_rate_action(NULL),
        _sample_rate_list(this),
        _icon_red(":/icons/status-red.svg"),
        _icon_green(":/icons/status-green.svg"),
@@ -100,8 +104,10 @@ SamplingBar::SamplingBar(QWidget *parent) :
 
        _configure_button.setIcon(QIcon::fromTheme("configure",
                QIcon(":/icons/configure.png")));
+
        _probes_button.setIcon(QIcon::fromTheme("probes",
                QIcon(":/icons/probes.svg")));
+       _probes_button.set_popup(&_probes_popup);
 
        _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
@@ -122,6 +128,8 @@ SamplingBar::SamplingBar(QWidget *parent) :
 void SamplingBar::set_device_list(
        const std::list<struct sr_dev_inst*> &devices)
 {
+       _updating_device_selector = true;
+
        _device_selector.clear();
 
        BOOST_FOREACH (sr_dev_inst *sdi, devices) {
@@ -130,7 +138,9 @@ void SamplingBar::set_device_list(
                        qVariantFromValue((void*)sdi));
        }
 
-       update_sample_rate_selector();
+       _updating_device_selector = false;
+
+       on_device_selected();
 }
 
 struct sr_dev_inst* SamplingBar::get_selected_device() const
@@ -175,7 +185,6 @@ 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);
@@ -183,8 +192,8 @@ void SamplingBar::update_sample_rate_selector()
        if (!sdi)
                return;
 
-       if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
-                       &gvar_dict, sdi) != SR_OK)
+       if (sr_config_list(sdi->driver, sdi, NULL,
+                       SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK)
                return;
 
        _sample_rate_list_action->setVisible(false);
@@ -198,7 +207,7 @@ void SamplingBar::update_sample_rate_selector()
                _sample_rate_value.setSingleStep(elements[2]);
                g_variant_unref(gvar_list);
 
-               selector_action = _sample_rate_value_action;
+               _sample_rate_action = _sample_rate_value_action;
        }
        else if ((gvar_list = g_variant_lookup_value(gvar_dict,
                        "samplerates", G_VARIANT_TYPE("at"))))
@@ -218,7 +227,7 @@ void SamplingBar::update_sample_rate_selector()
                _sample_rate_list.show();
                g_variant_unref(gvar_list);
 
-               selector_action = _sample_rate_list_action;
+               _sample_rate_action = _sample_rate_list_action;
        }
 
        g_variant_unref(gvar_dict);
@@ -226,8 +235,8 @@ void SamplingBar::update_sample_rate_selector()
 
        // We delay showing the action, so that value change events
        // are ignored.
-       if (selector_action)
-               selector_action->setVisible(true);
+       if (_sample_rate_action)
+               _sample_rate_action->setVisible(true);
 }
 
 void SamplingBar::update_sample_rate_selector_value()
@@ -238,8 +247,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;
@@ -250,9 +259,9 @@ void SamplingBar::update_sample_rate_selector_value()
        assert(_sample_rate_value_action);
        assert(_sample_rate_list_action);
 
-       if (_sample_rate_value_action->isVisible())
+       if (_sample_rate_action == _sample_rate_value_action)
                _sample_rate_value.setValue(samplerate);
-       else if (_sample_rate_list_action->isVisible())
+       else if (_sample_rate_action == _sample_rate_list_action)
        {
                for (int i = 0; i < _sample_rate_list.count(); i++)
                        if (samplerate == _sample_rate_list.itemData(
@@ -271,9 +280,9 @@ void SamplingBar::commit_sample_rate()
        assert(_sample_rate_value_action);
        assert(_sample_rate_list_action);
 
-       if (_sample_rate_value_action->isVisible())
+       if (_sample_rate_action == _sample_rate_value_action)
                sample_rate = (uint64_t)_sample_rate_value.value();
-       else if (_sample_rate_list_action->isVisible())
+       else if (_sample_rate_action == _sample_rate_list_action)
        {
                const int index = _sample_rate_list.currentIndex();
                if (index >= 0)
@@ -285,7 +294,7 @@ void SamplingBar::commit_sample_rate()
                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;
@@ -296,14 +305,15 @@ void SamplingBar::on_device_selected()
 {
        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);
 
        _configure_button.set_popup(new DeviceOptions(sdi, this));
-       _probes_button.set_popup(new Probes(sdi, this));
-
-       device_selected();
 }
 
 void SamplingBar::on_sample_rate_changed()