Reworked SamplingBar device selection logic

  * Split on_device_selected into update_device_config_widgets. This allows
    the widgets to be updated with calling SigSession::set_device.

  * Don't rely on the on_device_selected event handler to update the device
    config widgets. If MainWindow selects a device, that device may be the
    0th drop-down element, and already selected in which case there will be
    no device_selected signal, because there was no change in the selection.
    We now surpress on_device_selected with _updating_device_selector, then
    set the selected device in the drop-down, then call
    update_device_config_widgets to manually update the widgets.

  * Combined set_selected_device into set_device_list, so that the two can
    be set in one operation.

  * This fixes bug #334

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 7a7a1b12baddf2ee85acdf65ee2cd64b3db09e86..0089b112a721f1585a9813134328cfd30c360ccb 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -299,11 +299,9 @@ void MainWindow::update_device_list()
        if (std::find(devices.begin(), devices.end(), selected_device) ==
                devices.end())
                devices.push_back(selected_device);
+       assert(selected_device);
 
-       _sampling_bar->set_device_list(devices);
-
-       if (selected_device)
-               _sampling_bar->set_selected_device(selected_device);
+       _sampling_bar->set_device_list(devices, selected_device);
 }
 
 void MainWindow::load_file(QString file_name)

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index dce7aa38417753c7927f3eefa0c23cd0369b7ae4..91c4b076ea6346d46102100ec20eec4a0c201756 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -96,8 +96,13 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 }
 
 void SamplingBar::set_device_list(
-       const std::list< shared_ptr<pv::device::DevInst> > &devices)
+       const std::list< shared_ptr<pv::device::DevInst> > &devices,
+       shared_ptr<pv::device::DevInst> selected)
 {
+       int selected_index = -1;
+
+       assert(selected);
+
        _updating_device_selector = true;
 
        _device_selector.clear();
@@ -109,11 +114,20 @@ void SamplingBar::set_device_list(
                const sr_dev_inst *sdi = dev_inst->dev_inst();
                assert(sdi);
 
+               if (selected == dev_inst)
+                       selected_index = _device_selector.count();
+
                _device_selector_map[sdi] = dev_inst;
                _device_selector.addItem(title.c_str(),
                        qVariantFromValue((void*)sdi));
        }
 
+       // The selected device should have been in the list
+       assert(selected_index != -1);
+       _device_selector.setCurrentIndex(selected_index);
+
+       update_device_config_widgets();
+
        _updating_device_selector = false;
 }
 
@@ -136,20 +150,6 @@ shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
        return shared_ptr<pv::device::DevInst>((*iter).second);
 }
 
-void SamplingBar::set_selected_device(shared_ptr<pv::device::DevInst> dev_inst)
-{
-       assert(dev_inst);
-
-       for (int i = 0; i < _device_selector.count(); i++)
-               if (dev_inst->dev_inst() ==
-                       _device_selector.itemData(i).value<void*>()) {
-                       // Calling this leads to on_device_selected being
-                       // invoked, which updates the sampling bar widgets.
-                       _device_selector.setCurrentIndex(i);
-                       return;
-               }
-}
-
 void SamplingBar::set_capture_state(pv::SigSession::capture_state state)
 {
        const QIcon *icons[] = {&_icon_grey, &_icon_red, &_icon_green};
@@ -303,6 +303,59 @@ void SamplingBar::update_sample_count_selector()
        _updating_sample_count = false;
 }
 
+void SamplingBar::update_device_config_widgets()
+{
+       GVariant *gvar;
+
+       using namespace pv::popups;
+
+       const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+       if (!dev_inst)
+               return;
+
+       // Update the configure popup
+       DeviceOptions *const opts = new DeviceOptions(dev_inst, 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);
+
+       // Update supported options.
+       _sample_count_supported = false;
+
+       if ((gvar = dev_inst->list_config(NULL, SR_CONF_DEVICE_OPTIONS)))
+       {
+               gsize num_opts;
+               const int *const options =
+                       (const int32_t *)g_variant_get_fixed_array(
+                               gvar, &num_opts, sizeof(int32_t));
+               for (unsigned int i = 0; i < num_opts; i++)
+               {
+                       switch (options[i]) {
+                       case SR_CONF_LIMIT_SAMPLES:
+                               _sample_count_supported = true;
+                               break;
+                       case SR_CONF_LIMIT_FRAMES:
+                               dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES,
+                                       g_variant_new_uint64(1));
+                               break;
+                       }
+               }
+       }
+
+       // Add notification of reconfigure events
+       disconnect(this, SLOT(on_config_changed()));
+       connect(dev_inst.get(), SIGNAL(config_changed()),
+               this, SLOT(on_config_changed()));
+
+       // Update sweep timing widgets.
+       update_sample_count_selector();
+       update_sample_rate_selector();
+}
+
 void SamplingBar::commit_sample_count()
 {
        uint64_t sample_count = 0;
@@ -356,10 +409,6 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
-       GVariant *gvar;
-
-       using namespace pv::popups;
-
        if (_updating_device_selector)
                return;
 
@@ -369,47 +418,7 @@ void SamplingBar::on_device_selected()
 
        _session.set_device(dev_inst);
 
-       // Update the configure popup
-       DeviceOptions *const opts = new DeviceOptions(dev_inst, 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);
-
-       // Update supported options.
-       _sample_count_supported = false;
-
-       if ((gvar = dev_inst->list_config(NULL, SR_CONF_DEVICE_OPTIONS)))
-       {
-               gsize num_opts;
-               const int *const options =
-                       (const int32_t *)g_variant_get_fixed_array(
-                               gvar, &num_opts, sizeof(int32_t));
-               for (unsigned int i = 0; i < num_opts; i++)
-               {
-                       switch (options[i]) {
-                       case SR_CONF_LIMIT_SAMPLES:
-                               _sample_count_supported = true;
-                               break;
-                       case SR_CONF_LIMIT_FRAMES:
-                               dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES,
-                                       g_variant_new_uint64(1));
-                               break;
-                       }
-               }
-       }
-
-       // Add notification of reconfigure events
-       disconnect(this, SLOT(on_config_changed()));
-       connect(dev_inst.get(), SIGNAL(config_changed()),
-               this, SLOT(on_config_changed()));
-
-       // Update sweep timing widgets.
-       update_sample_count_selector();
-       update_sample_rate_selector();
+       update_device_config_widgets();
 }
 
 void SamplingBar::on_sample_count_changed()

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index db4e856e26dfff48a59a80bae7f41909aa124e30..e59d2f9f0b195da8417c126de2ea6f4ec7f53539 100644 (file)
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -63,11 +63,10 @@ public:
 
        void set_device_list(
                const std::list< boost::shared_ptr<pv::device::DevInst> >
-                       &devices);
+                       &devices,
+               boost::shared_ptr<pv::device::DevInst> selected);
 
        boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
-       void set_selected_device(
-               boost::shared_ptr<pv::device::DevInst> dev_inst);
 
        void set_capture_state(pv::SigSession::capture_state state);
 
@@ -78,6 +77,7 @@ private:
        void update_sample_rate_selector();
        void update_sample_rate_selector_value();
        void update_sample_count_selector();
+       void update_device_config_widgets();
        void commit_sample_rate();
        void commit_sample_count();