Fix #970 by making sure the session state handler can be called

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 7e48e5a9f96a21f7c64cd9fe5a6d049d826ad70f..9a3f197d4c2174edd3a9b814b9b340d1fc695fce 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -21,11 +21,11 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
-#include <cassert>
 #include <algorithm>
-#include <iterator>
-#include <cstdint>
+#include <cassert>
 #include <cstdarg>
+#include <cstdint>
+#include <iterator>
 
 #include <QAction>
 #include <QApplication>
@@ -34,17 +34,17 @@
 #include <QHBoxLayout>
 #include <QMessageBox>
 #include <QSettings>
-#include <QWidget>
 #include <QShortcut>
+#include <QWidget>
 
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
-#include "globalsettings.hpp"
-#include "util.hpp"
 #include "devices/hardwaredevice.hpp"
 #include "dialogs/settings.hpp"
+#include "globalsettings.hpp"
 #include "toolbars/mainbar.hpp"
+#include "util.hpp"
 #include "view/view.hpp"
 #include "views/trace/standardbar.hpp"
 
@@ -70,7 +70,7 @@ const QString MainWindow::WindowTitle = tr("PulseView");
 
 MainWindow::MainWindow(DeviceManager &device_manager,
        string open_file_name, string open_file_format,
-       QWidget *parent) :
+       bool restore_sessions, QWidget *parent) :
        QMainWindow(parent),
        device_manager_(device_manager),
        session_selector_(this),
@@ -88,8 +88,11 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
                bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
 
+       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid,
+               bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1));
+
        setup_ui();
-       restore_ui_settings();
+       restore_ui_settings(restore_sessions);
 
        if (!open_file_name.empty()) {
                shared_ptr<Session> session = add_session();
@@ -185,6 +188,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
        dock_main->setCentralWidget(v.get());
        dock->setWidget(dock_main);
 
+       dock->setContextMenuPolicy(Qt::PreventContextMenu);
        dock->setFeatures(QDockWidget::DockWidgetMovable |
                QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
@@ -205,6 +209,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
                tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
                tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
+               tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool());
 
                if (!main_bar) {
                        /* Initial view, create the main bar */
@@ -298,8 +303,18 @@ shared_ptr<Session> MainWindow::add_session()
 
 void MainWindow::remove_session(shared_ptr<Session> session)
 {
+       // Determine the height of the button before it collapses
        int h = new_session_button_->height();
 
+       // Stop capture while the session still exists so that the UI can be
+       // updated in case we're currently running. If so, this will schedule a
+       // call to our on_capture_state_changed() slot for the next run of the
+       // event loop. We need to have this executed immediately or else it will
+       // be dismissed since the session object will be deleted by the time we
+       // leave this method and the event loop gets a chance to run again.
+       session->stop_capture();
+       QApplication::processEvents();
+
        for (shared_ptr<views::ViewBase> view : session->views())
                remove_view(view);
 
@@ -311,6 +326,7 @@ void MainWindow::remove_session(shared_ptr<Session> session)
        if (last_focused_session_ == session)
                last_focused_session_.reset();
 
+       // Remove the session from our list of sessions (which also destroys it)
        sessions_.remove_if([&](shared_ptr<Session> s) {
                return s == session; });
 
@@ -348,6 +364,9 @@ void MainWindow::setup_ui()
        view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut()));
        view_show_sampling_points_shortcut_->setAutoRepeat(false);
 
+       view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut()));
+       view_show_analog_minor_grid_shortcut_->setAutoRepeat(false);
+
        view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
        view_coloured_bg_shortcut_->setAutoRepeat(false);
 
@@ -367,8 +386,8 @@ void MainWindow::setup_ui()
        run_stop_shortcut_->setAutoRepeat(false);
 
        settings_button_ = new QToolButton();
-       settings_button_->setIcon(QIcon::fromTheme("configure",
-               QIcon(":/icons/configure.png")));
+       settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+               QIcon(":/icons/preferences-system.png")));
        settings_button_->setToolTip(tr("Settings"));
        settings_button_->setAutoRaise(true);
 
@@ -447,10 +466,9 @@ void MainWindow::save_ui_settings()
        settings.setValue("sessions", id);
 }
 
-void MainWindow::restore_ui_settings()
+void MainWindow::restore_ui_settings(bool restore_sessions)
 {
        QSettings settings;
-       int i, session_count;
 
        settings.beginGroup("MainWindow");
 
@@ -462,13 +480,17 @@ void MainWindow::restore_ui_settings()
 
        settings.endGroup();
 
-       session_count = settings.value("sessions", 0).toInt();
+       if (restore_sessions) {
+               int i, session_count;
 
-       for (i = 0; i < session_count; i++) {
-               settings.beginGroup("Session" + QString::number(i));
-               shared_ptr<Session> session = add_session();
-               session->restore_settings(settings);
-               settings.endGroup();
+               session_count = settings.value("sessions", 0).toInt();
+
+               for (i = 0; i < session_count; i++) {
+                       settings.beginGroup("Session" + QString::number(i));
+                       shared_ptr<Session> session = add_session();
+                       session->restore_settings(settings);
+                       settings.endGroup();
+               }
        }
 }
 
@@ -713,7 +735,8 @@ void MainWindow::on_tab_close_requested(int index)
 {
        shared_ptr<Session> session = get_tab_session(index);
 
-       assert(session);
+       if (!session)
+               return;
 
        if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
                tr("This session contains unsaved data. Close it anyway?"),
@@ -745,6 +768,14 @@ void MainWindow::on_view_show_sampling_points_shortcut()
        settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
 }
 
+void MainWindow::on_view_show_analog_minor_grid_shortcut()
+{
+       GlobalSettings settings;
+
+       bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool();
+       settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
+}
+
 void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
 {
        bool state = new_value.toBool();
@@ -775,6 +806,21 @@ void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_val
        }
 }
 
+void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value)
+{
+       bool state = new_value.toBool();
+
+       for (auto entry : view_docks_) {
+               shared_ptr<views::ViewBase> viewbase = entry.second;
+
+               // Only trace views have this setting
+               views::TraceView::View* view =
+                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               if (view)
+                       view->enable_show_analog_minor_grid(state);
+       }
+}
+
 void MainWindow::on_close_current_tab()
 {
        int tab = session_selector_.currentIndex();