Add a hotkey to show/hide sampling points.

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 23de2087c94120e030834c9e1dfb0e8ec6312952..07e97666a2e60e59acd4309b17f294a28df37609 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -562,14 +562,11 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
        return make_pair(*left_time, *right_time);
 }
 
-void View::enable_sticky_scrolling(bool state)
+void View::enable_show_sampling_points(bool state)
 {
-       sticky_scrolling_ = state;
-}
+       (void)state;
 
-void View::toggle_sticky_scrolling(void)
-{
-       sticky_scrolling_ = !sticky_scrolling_;
+       viewport_->update();
 }
 
 void View::enable_coloured_bg(bool state)
@@ -627,8 +624,8 @@ std::shared_ptr<CursorPair> View::cursors() const
 
 void View::add_flag(const Timestamp& time)
 {
-       flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
-               QString("%1").arg(next_flag_text_))));
+       flags_.push_back(make_shared<Flag>(*this, time,
+               QString("%1").arg(next_flag_text_)));
 
        next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
                (next_flag_text_ + 1);
@@ -676,7 +673,7 @@ void View::restack_all_trace_tree_items()
                o->restack_items();
 
        // Re-assign background colors
-       bool next_bgcolour_state = 0;
+       bool next_bgcolour_state = false;
 
        for (auto &o : sorted_owners)
                next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
@@ -688,8 +685,7 @@ void View::restack_all_trace_tree_items()
 
 void View::trigger_event(util::Timestamp location)
 {
-       trigger_markers_.push_back(shared_ptr<TriggerMarker>(
-               new TriggerMarker(*this, location)));
+       trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -1242,6 +1238,9 @@ void View::capture_state_updated(int state)
                        always_zoom_to_fit_ = true;
                        always_zoom_to_fit_changed(always_zoom_to_fit_);
                }
+
+               // Enable sticky scrolling if the setting is enabled
+               sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
        }
 
        if (state == Session::Stopped) {