X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=205c95ca95a765670d5386e16345ef176dcdf804;hp=4e6ab75d9502b190e85e3823d839261fa36134f5;hb=d008cab11b7508601e793d47e53a87be9972aed1;hpb=9b64f2dfe9179f665ef97c0d0ac992274864f4a4 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 4e6ab75d..205c95ca 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -21,11 +21,11 @@ #include #endif -#include #include -#include -#include +#include #include +#include +#include #include #include @@ -34,26 +34,27 @@ #include #include #include -#include #include +#include #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" #include +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; @@ -65,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, @@ -87,6 +85,12 @@ 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)); + + GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid, + bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1)); + setup_ui(); restore_ui_settings(); @@ -133,10 +137,10 @@ shared_ptr MainWindow::get_active_view() const QDockWidget *dock = nullptr; while (w) { - dock = qobject_cast(w); - if (dock) - break; - w = w->parent(); + dock = qobject_cast(w); + if (dock) + break; + w = w->parent(); } // Get the view contained in the dock widget @@ -203,6 +207,8 @@ shared_ptr MainWindow::add_view(const QString &title, qobject_cast(v.get()); 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 */ @@ -343,6 +349,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_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); @@ -362,8 +374,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); @@ -467,7 +479,7 @@ void MainWindow::restore_ui_settings() } } -std::shared_ptr MainWindow::get_tab_session(int index) const +shared_ptr MainWindow::get_tab_session(int index) const { // Find the session that belongs to the tab's main window for (auto entry : session_windows_) @@ -532,7 +544,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 s : sessions_) + for (shared_ptr s : sessions_) if (s.get() == session) add_view(title, type, *s); } @@ -652,7 +664,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 s : sessions_) + for (shared_ptr s : sessions_) if (s.get() == session) add_view(session->name(), views::ViewTypeTrace, *s); } @@ -732,6 +744,22 @@ void MainWindow::on_view_sticky_scrolling_shortcut() settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state); } +void MainWindow::on_view_show_sampling_points_shortcut() +{ + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool(); + 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(); @@ -747,6 +775,36 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value) } } +void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value) +{ + bool state = new_value.toBool(); + + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::TraceView::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_show_sampling_points(state); + } +} + +void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value) +{ + bool state = new_value.toBool(); + + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::TraceView::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_show_analog_minor_grid(state); + } +} + void MainWindow::on_close_current_tab() { int tab = session_selector_.currentIndex();