MainBar: Fix #594 by changing calling order and flag usage

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

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 8c2be4686b29075711e1c1a5926855518f8aed8f..529f25f46a1baf7bae3c4270d92c588ee052cd69 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -71,8 +71,9 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
        device_selector_(this, session.device_manager(),
                main_window.action_connect()),
        configure_button_(this),
-       configure_button_action_(NULL),
+       configure_button_action_(nullptr),
        channels_button_(this),
+       channels_button_action_(nullptr),
        sample_count_(" samples", this),
        sample_rate_("Hz", this),
        updating_sample_rate_(false),
@@ -82,6 +83,7 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
        icon_green_(":/icons/status-green.svg"),
        icon_grey_(":/icons/status-grey.svg"),
        run_stop_button_(this),
+       run_stop_button_action_(nullptr),
        menu_button_(this)
 {
        setObjectName(QString::fromUtf8("MainBar"));
@@ -182,10 +184,10 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 
        addWidget(&device_selector_);
        configure_button_action_ = addWidget(&configure_button_);
-       addWidget(&channels_button_);
+       channels_button_action_ = addWidget(&channels_button_);
        addWidget(&sample_count_);
        addWidget(&sample_rate_);
-       addWidget(&run_stop_button_);
+       run_stop_button_action_ = addWidget(&run_stop_button_);
 #ifdef ENABLE_DECODE
        addSeparator();
        addWidget(add_decoder_button);
@@ -211,7 +213,6 @@ void MainBar::update_device_list()
 
        if (std::find(devs.begin(), devs.end(), selected_device) == devs.end())
                devs.push_back(selected_device);
-       assert(selected_device);
 
        device_selector_.set_device_list(devs, selected_device);
        update_device_config_widgets();
@@ -231,12 +232,14 @@ void MainBar::update_sample_rate_selector()
 {
        Glib::VariantContainerBase gvar_dict;
        GVariant *gvar_list;
-       const uint64_t *elements = NULL;
+       const uint64_t *elements = nullptr;
        gsize num_elements;
        map< const ConfigKey*, std::set<Capability> > keys;
 
-       if (updating_sample_rate_)
+       if (updating_sample_rate_) {
+               sample_rate_.show_none();
                return;
+       }
 
        const shared_ptr<devices::Device> device =
                device_selector_.selected_device();
@@ -405,8 +408,16 @@ void MainBar::update_device_config_widgets()
 
        const shared_ptr<devices::Device> device =
                device_selector_.selected_device();
-       if (!device)
+
+       // Hide the widgets if no device is selected
+       channels_button_action_->setVisible(!!device);
+       run_stop_button_action_->setVisible(!!device);
+       if (!device) {
+               configure_button_action_->setVisible(false);
+               sample_count_.show_none();
+               sample_rate_.show_none();
                return;
+       }
 
        const shared_ptr<sigrok::Device> sr_dev = device->device();
        if (!sr_dev)
@@ -496,9 +507,6 @@ void MainBar::commit_sample_rate()
 {
        uint64_t sample_rate = 0;
 
-       if (updating_sample_rate_)
-               return;
-
        const shared_ptr<devices::Device> device =
                device_selector_.selected_device();
        if (!device)
@@ -510,18 +518,14 @@ void MainBar::commit_sample_rate()
        if (sample_rate == 0)
                return;
 
-       // Set the samplerate
-       assert(!updating_sample_rate_);
-       updating_sample_rate_ = true;
        try {
                sr_dev->config_set(ConfigKey::SAMPLERATE,
                        Glib::Variant<guint64>::create(sample_rate));
-               on_config_changed();
+               update_sample_rate_selector();
        } catch (Error error) {
                qDebug() << "Failed to configure samplerate.";
                return;
        }
-       updating_sample_rate_ = false;
 }
 
 void MainBar::on_device_selected()
@@ -542,7 +546,8 @@ void MainBar::on_sample_count_changed()
 
 void MainBar::on_sample_rate_changed()
 {
-       commit_sample_rate();
+       if (!updating_sample_rate_)
+               commit_sample_rate();
 }
 
 void MainBar::on_run_stop()
@@ -555,9 +560,8 @@ void MainBar::on_run_stop()
 void MainBar::on_config_changed()
 {
        commit_sample_count();
-       update_sample_count_selector(); 
+       update_sample_count_selector();
        commit_sample_rate();   
-       update_sample_rate_selector();
 }
 
 bool MainBar::eventFilter(QObject *watched, QEvent *event)