Implemented support for probe groups

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

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index db7e8e0b1a1dc330397099ea0cfb63794db093a6..778f7aa1cdf747a74d00995da7d051e5a1ba7deb 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -33,8 +33,9 @@
 
 #include <pv/devicemanager.h>
 #include <pv/popups/deviceoptions.h>
+#include <pv/popups/probes.h>
 
-using namespace std;
+using std::string;
 
 namespace pv {
 namespace toolbars {
@@ -70,8 +71,8 @@ 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_action(NULL),
        _sample_rate_list(this),
@@ -92,7 +93,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
        {
                const uint64_t &l = RecordLengths[i];
                char *const text = sr_si_string_u64(l, " samples");
-               _record_length_selector.addItem(QString(text),
+               _record_length_selector.addItem(QString::fromUtf8(text),
                        qVariantFromValue(l));
                g_free(text);
 
@@ -107,12 +108,11 @@ 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);
@@ -219,7 +219,7 @@ void SamplingBar::update_sample_rate_selector()
                for (unsigned int i = 0; i < num_elements; i++)
                {
                        char *const s = sr_samplerate_string(elements[i]);
-                       _sample_rate_list.addItem(QString(s),
+                       _sample_rate_list.addItem(QString::fromUtf8(s),
                                qVariantFromValue(elements[i]));
                        g_free(s);
                }
@@ -313,7 +313,15 @@ void SamplingBar::on_device_selected()
        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_rate_changed()