Adapt to config key capabilities.

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

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index af5afb0c27774b980ae843c68e73a81b6e135217..c34373776ca572ca101465a2fc73bfff2ab2cf80 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -32,7 +32,7 @@
 #include <pv/devicemanager.h>
 #include <pv/device/devinst.h>
 #include <pv/popups/deviceoptions.h>
-#include <pv/popups/probes.h>
+#include <pv/popups/channels.h>
 #include <pv/util.h>
 
 using std::map;
@@ -55,7 +55,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
        _updating_device_selector(false),
        _configure_button(this),
        _configure_button_action(NULL),
-       _probes_button(this),
+       _channels_button(this),
        _sample_count(" samples", this),
        _sample_rate("Hz", this),
        _updating_sample_rate(false),
@@ -66,6 +66,8 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
        _icon_grey(":/icons/status-grey.svg"),
        _run_stop_button(this)
 {
+       setObjectName(QString::fromUtf8("SamplingBar"));
+
        connect(&_run_stop_button, SIGNAL(clicked()),
                this, SLOT(on_run_stop()));
        connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
@@ -82,14 +84,14 @@ 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")));
+       _channels_button.setIcon(QIcon::fromTheme("channels",
+               QIcon(":/icons/channels.svg")));
 
        _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
        addWidget(&_device_selector);
        _configure_button_action = addWidget(&_configure_button);
-       addWidget(&_probes_button);
+       addWidget(&_channels_button);
        addWidget(&_sample_count);
        addWidget(&_sample_rate);
 
@@ -322,9 +324,9 @@ void SamplingBar::update_device_config_widgets()
                !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);
+       // Update the channels popup
+       Channels *const channels = new Channels(_session, this);
+       _channels_button.set_popup(channels);
 
        // Update supported options.
        _sample_count_supported = false;
@@ -337,13 +339,15 @@ void SamplingBar::update_device_config_widgets()
                                gvar, &num_opts, sizeof(int32_t));
                for (unsigned int i = 0; i < num_opts; i++)
                {
-                       switch (options[i]) {
+                       switch (options[i] & SR_CONF_MASK) {
                        case SR_CONF_LIMIT_SAMPLES:
-                               _sample_count_supported = true;
+                               if (options[i] & SR_CONF_SET)
+                                       _sample_count_supported = true;
                                break;
                        case SR_CONF_LIMIT_FRAMES:
-                               dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES,
-                                       g_variant_new_uint64(1));
+                               if (options[i] & SR_CONF_SET)
+                                       dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES,
+                                               g_variant_new_uint64(1));
                                break;
                        }
                }