X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=d13c8e197e3bfc917cd0ec697fbdfe72c54a2947;hp=b6cca7b2edadb99d8313b7d92ccbf4313c028386;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=051ba3b399abbd83fea8b7ef6f8876884ac0786c

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index b6cca7b2..d13c8e19 100644
--- 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,26 +34,27 @@
 #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"
 
 #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;
 
@@ -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,
@@ -90,6 +88,9 @@ 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();
 
@@ -136,10 +137,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
@@ -207,6 +208,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 */
@@ -350,6 +352,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);
 
@@ -474,7 +479,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_)
@@ -539,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<Session> s : sessions_)
+	for (shared_ptr<Session> s : sessions_)
 		if (s.get() == session)
 			add_view(title, type, *s);
 }
@@ -659,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<Session> s : sessions_)
+	for (shared_ptr<Session> s : sessions_)
 		if (s.get() == session)
 			add_view(session->name(), views::ViewTypeTrace, *s);
 }
@@ -747,6 +752,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();
@@ -777,6 +790,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();