X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=7e48e5a9f96a21f7c64cd9fe5a6d049d826ad70f;hp=9164c6e82ac0e330623ff8105db4a6c92a311d24;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 9164c6e8..7e48e5a9 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -50,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;
 
@@ -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,
@@ -86,8 +84,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_StickyScrolling,
-		bind(&MainWindow::on_settingViewStickyScrolling_changed, this, _1));
+
+	GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
+		bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
 
 	setup_ui();
 	restore_ui_settings();
@@ -135,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
@@ -204,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 */
@@ -346,6 +345,9 @@ 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);
 
@@ -470,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_)
@@ -535,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);
 }
@@ -655,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);
 }
@@ -735,6 +737,14 @@ 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_settingViewColouredBg_changed(const QVariant new_value)
 {
 	bool state = new_value.toBool();
@@ -750,7 +760,7 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
 	}
 }
 
-void MainWindow::on_settingViewStickyScrolling_changed(const QVariant new_value)
+void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
 {
 	bool state = new_value.toBool();
 
@@ -761,7 +771,7 @@ void MainWindow::on_settingViewStickyScrolling_changed(const QVariant new_value)
 		views::TraceView::View* view =
 				qobject_cast<views::TraceView::View*>(viewbase.get());
 		if (view)
-			view->enable_sticky_scrolling(state);
+			view->enable_show_sampling_points(state);
 	}
 }