Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index eaaea089964c9ba32c245e6d8641c6c592997a02..7e48e5a9f96a21f7c64cd9fe5a6d049d826ad70f 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -43,7 +43,6 @@
 #include "globalsettings.hpp"
 #include "util.hpp"
 #include "devices/hardwaredevice.hpp"
-#include "dialogs/about.hpp"
 #include "dialogs/settings.hpp"
 #include "toolbars/mainbar.hpp"
 #include "view/view.hpp"
@@ -51,10 +50,11 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::bind;
 using std::dynamic_pointer_cast;
-using std::list;
 using std::make_shared;
 using std::map;
+using std::placeholders::_1;
 using std::shared_ptr;
 using std::string;
 
@@ -66,9 +66,6 @@ class ViewItem;
 
 using toolbars::MainBar;
 
-using std::bind;
-using std::placeholders::_1;
-
 const QString MainWindow::WindowTitle = tr("PulseView");
 
 MainWindow::MainWindow(DeviceManager &device_manager,
@@ -78,7 +75,6 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        device_manager_(device_manager),
        session_selector_(this),
        session_state_mapper_(this),
-       action_about_(new QAction(this)),
        icon_red_(":/icons/status-red.svg"),
        icon_green_(":/icons/status-green.svg"),
        icon_grey_(":/icons/status-grey.svg")
@@ -89,6 +85,9 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
                bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
 
+       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
+               bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
+
        setup_ui();
        restore_ui_settings();
 
@@ -124,11 +123,6 @@ MainWindow::~MainWindow()
                remove_session(sessions_.front());
 }
 
-QAction* MainWindow::action_about() const
-{
-       return action_about_;
-}
-
 shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 {
        // If there's only one view, use it...
@@ -140,10 +134,10 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
        QDockWidget *dock = nullptr;
 
        while (w) {
-           dock = qobject_cast<QDockWidget*>(w);
-           if (dock)
-               break;
-           w = w->parent();
+               dock = qobject_cast<QDockWidget*>(w);
+               if (dock)
+                       break;
+               w = w->parent();
        }
 
        // Get the view contained in the dock widget
@@ -209,8 +203,8 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
                views::TraceView::View *tv =
                        qobject_cast<views::TraceView::View*>(v.get());
 
-               tv->enable_sticky_scrolling(true);
                tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+               tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
 
                if (!main_bar) {
                        /* Initial view, create the main bar */
@@ -351,12 +345,12 @@ void MainWindow::setup_ui()
        view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
        view_sticky_scrolling_shortcut_->setAutoRepeat(false);
 
+       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_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
        view_coloured_bg_shortcut_->setAutoRepeat(false);
 
-       action_about_->setObjectName(QString::fromUtf8("actionAbout"));
-       action_about_->setToolTip(tr("&About..."));
-
        // Set up the tab area
        new_session_button_ = new QToolButton();
        new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@ -478,7 +472,7 @@ void MainWindow::restore_ui_settings()
        }
 }
 
-std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
+shared_ptr<Session> MainWindow::get_tab_session(int index) const
 {
        // Find the session that belongs to the tab's main window
        for (auto entry : session_windows_)
@@ -543,7 +537,7 @@ void MainWindow::on_add_view(const QString &title, views::ViewType type,
        Session *session)
 {
        // We get a pointer and need a reference
-       for (std::shared_ptr<Session> s : sessions_)
+       for (shared_ptr<Session> s : sessions_)
                if (s.get() == session)
                        add_view(title, type, *s);
 }
@@ -611,7 +605,7 @@ void MainWindow::on_run_stop_clicked()
 
 void MainWindow::on_settings_clicked()
 {
-       dialogs::Settings dlg;
+       dialogs::Settings dlg(device_manager_);
        dlg.exec();
 }
 
@@ -663,7 +657,7 @@ void MainWindow::on_capture_state_changed(QObject *obj)
 void MainWindow::on_new_view(Session *session)
 {
        // We get a pointer and need a reference
-       for (std::shared_ptr<Session> s : sessions_)
+       for (shared_ptr<Session> s : sessions_)
                if (s.get() == session)
                        add_view(session->name(), views::ViewTypeTrace, *s);
 }
@@ -727,21 +721,28 @@ void MainWindow::on_tab_close_requested(int index)
                remove_session(session);
 }
 
+void MainWindow::on_view_coloured_bg_shortcut()
+{
+       GlobalSettings settings;
+
+       bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+       settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+}
+
 void MainWindow::on_view_sticky_scrolling_shortcut()
 {
-       shared_ptr<views::ViewBase> viewbase = get_active_view();
-       views::TraceView::View* view =
-               qobject_cast<views::TraceView::View*>(viewbase.get());
-       if (view)
-               view->toggle_sticky_scrolling();
+       GlobalSettings settings;
+
+       bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+       settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
 }
 
-void MainWindow::on_view_coloured_bg_shortcut()
+void MainWindow::on_view_show_sampling_points_shortcut()
 {
        GlobalSettings settings;
 
-       bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
-       settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+       bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+       settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
 }
 
 void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
@@ -759,10 +760,19 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
        }
 }
 
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
 {
-       dialogs::About dlg(device_manager_.context(), this);
-       dlg.exec();
+       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_sampling_points(state);
+       }
 }
 
 void MainWindow::on_close_current_tab()