X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=f0aa491e585fa5f90998e9697a151404d2fb3275;hp=bfa7ed3eaa5b4ed16e909aa75cb22587760aee76;hb=873e80357d9622678069fcfe83b010717a68284c;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index bfa7ed3e..f0aa491e 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -116,9 +116,9 @@ public:
 #ifdef ENABLE_DECODE
 	virtual void clear_decode_signals();
 
-	virtual void add_decode_signal(shared_ptr<data::SignalBase> signalbase);
+	virtual void add_decode_signal(shared_ptr<data::DecodeSignal> signal);
 
-	virtual void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
+	virtual void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
 	/**
@@ -269,7 +269,7 @@ public:
 	void restack_all_trace_tree_items();
 
 Q_SIGNALS:
-	void hover_point_changed();
+	void hover_point_changed(const QPoint &hp);
 
 	void selection_changed();
 
@@ -347,6 +347,8 @@ private:
 
 	void resizeEvent(QResizeEvent *event);
 
+	void update_hover_point();
+
 public:
 	void row_item_appearance_changed(bool label, bool content);
 	void time_item_appearance_changed(bool label, bool content);
@@ -367,8 +369,6 @@ private Q_SLOTS:
 
 	void process_sticky_events();
 
-	void on_hover_point_changed();
-
 	/**
 	 * Sets the 'offset_' member and emits the 'offset_changed'
 	 * signal if needed.
@@ -454,6 +454,16 @@ private:
 
 	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
 	int saved_v_offset_;
+
+	// These are used to determine whether the view was altered after acq started
+	double scale_at_acq_start_;
+	pv::util::Timestamp offset_at_acq_start_;
+
+	// Used to suppress performing a "zoom to fit" when the session stops. This
+	// is needed when the view's settings are restored before acquisition ends.
+	// In that case we want to keep the restored settings, not have a "zoom to fit"
+	// mess them up.
+	bool suppress_zoom_to_fit_after_acq_;
 };
 
 } // namespace trace