Added .gitignore rules for ninja-build files, and Vim swp files

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

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 24c5a420e1782ce0834b172ecdaa60c0e6782d88..2fa2d3919af81048b6783ff91eb08bef9179007e 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -68,8 +68,10 @@ 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_list(this),
        _icon_red(":/icons/status-red.svg"),
@@ -101,8 +103,10 @@ SamplingBar::SamplingBar(SigSession &session, 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);
 
@@ -123,6 +127,8 @@ SamplingBar::SamplingBar(SigSession &session, 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) {
@@ -131,7 +137,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
@@ -184,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);
@@ -239,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;
@@ -286,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;
@@ -297,13 +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(_session, this));
 }
 
 void SamplingBar::on_sample_rate_changed()