AnalogSignal: Use setting change handler for threshold display

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

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index f8378d98204554305a32ba41516814da7a265012..ce78100f83383da5df9393ef28222cf02e577795 100644 (file)
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -212,9 +212,6 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
        connect(splitter_, SIGNAL(splitterMoved(int, int)),
                this, SLOT(on_splitter_moved()));
 
-       connect(this, SIGNAL(hover_point_changed()),
-               this, SLOT(on_hover_point_changed()));
-
        connect(&lazy_event_handler_, SIGNAL(timeout()),
                this, SLOT(process_sticky_events()));
        lazy_event_handler_.setSingleShot(true);
@@ -359,6 +356,9 @@ void View::restore_settings(QSettings &settings)
 
        settings_restored_ = true;
        suppress_zoom_to_fit_after_acq_ = true;
+
+       // Update the ruler so that it uses the new scale
+       calculate_tick_spacing();
 }
 
 vector< shared_ptr<TimeItem> > View::time_items() const
@@ -1005,11 +1005,11 @@ bool View::eventFilter(QObject *object, QEvent *event)
                else
                        hover_point_ = QPoint(-1, -1);
 
-               hover_point_changed();
+               update_hover_point();
 
        } else if (type == QEvent::Leave) {
                hover_point_ = QPoint(-1, -1);
-               hover_point_changed();
+               update_hover_point();
        } else if (type == QEvent::Show) {
 
                // This is somewhat of a hack, unfortunately. We cannot use
@@ -1047,6 +1047,16 @@ void View::resizeEvent(QResizeEvent* event)
        update_layout();
 }
 
+void View::update_hover_point()
+{
+       const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
+               list_by_type<TraceTreeItem>());
+       for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+               r->hover_point_changed(hover_point_);
+
+       hover_point_changed(hover_point_);
+}
+
 void View::row_item_appearance_changed(bool label, bool content)
 {
        if (label)
@@ -1388,14 +1398,6 @@ void View::process_sticky_events()
        sticky_events_ = 0;
 }
 
-void View::on_hover_point_changed()
-{
-       const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
-               list_by_type<TraceTreeItem>());
-       for (shared_ptr<TraceTreeItem> r : trace_tree_items)
-               r->hover_point_changed();
-}
-
 } // namespace trace
 } // namespace views
 } // namespace pv