X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=a6655d2f492ab941617fc95f7c694463b1aa6645;hp=8c41fd9e40692e504c9db06c39a26f4aa5a92f6d;hb=e23567ed84aa55e2a0c48252080058186f6b80e7;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 8c41fd9e..a6655d2f 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -64,12 +64,10 @@ namespace views {
 
 namespace trace {
 
-class CursorHeader;
 class DecodeTrace;
 class Header;
 class Ruler;
 class Signal;
-class Trace;
 class Viewport;
 class TriggerMarker;
 
@@ -105,6 +103,12 @@ public:
 
 	~View();
 
+	/**
+	 * Resets the view to its default state after construction. It does however
+	 * not reset the signal bases or any other connections with the session.
+	 */
+	virtual void reset_view_state();
+
 	Session& session();
 	const Session& session() const;
 
@@ -125,6 +129,8 @@ public:
 	virtual void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+	shared_ptr<Signal> get_signal_under_mouse_cursor() const;
+
 	/**
 	 * Returns the view of the owner.
 	 */
@@ -139,6 +145,8 @@ public:
 
 	const Viewport* viewport() const;
 
+	const Ruler* ruler() const;
+
 	virtual void save_settings(QSettings &settings) const;
 
 	virtual void restore_settings(QSettings &settings);
@@ -165,7 +173,7 @@ public:
 	 */
 	const pv::util::Timestamp& ruler_offset() const;
 
-	void set_zero_position(pv::util::Timestamp& position);
+	void set_zero_position(const pv::util::Timestamp& position);
 
 	void reset_zero_position();
 
@@ -228,8 +236,6 @@ public:
 
 	void zoom_fit(bool gui_state);
 
-	void zoom_one_to_one();
-
 	/**
 	 * Sets the scale and offset.
 	 * @param scale The new view scale in seconds per pixel.
@@ -298,13 +304,25 @@ public:
 	vector< shared_ptr<Flag> > flags() const;
 
 	const QPoint& hover_point() const;
+	const QWidget* hover_widget() const;
+
+	/**
+	 * Determines the closest level change (i.e. edge) to a given point, which
+	 * is useful for e.g. the "snap to edge" functionality.
+	 *
+	 * @param p The current position of the mouse cursor
+	 * @return The sample number of the nearest level change or -1 if none
+	 */
+	int64_t get_nearest_level_change(const QPoint &p);
 
 	void restack_all_trace_tree_items();
 
+	int header_width() const;
+
 	void on_setting_changed(const QString &key, const QVariant &value);
 
 Q_SIGNALS:
-	void hover_point_changed(const QPoint &hp);
+	void hover_point_changed(const QWidget* widget, const QPoint &hp);
 
 	void selection_changed();
 
@@ -337,6 +355,9 @@ Q_SIGNALS:
 	/// @param mode is a value of Trace::SegmentDisplayMode
 	void segment_display_mode_changed(int mode, bool segment_selectable);
 
+	/// Emitted when the cursors are shown/hidden
+	void cursor_state_changed(bool show);
+
 public Q_SLOTS:
 	void trigger_event(int segment_id, util::Timestamp location);
 
@@ -387,6 +408,8 @@ private:
 
 	bool eventFilter(QObject *object, QEvent *event);
 
+	virtual void contextMenuEvent(QContextMenuEvent *event);
+
 	void resizeEvent(QResizeEvent *event);
 
 	void update_hover_point();
@@ -507,7 +530,10 @@ private:
 
 	vector< shared_ptr<TriggerMarker> > trigger_markers_;
 
+	QWidget* hover_widget_;
 	QPoint hover_point_;
+	shared_ptr<Signal> signal_under_mouse_cursor_;
+	uint16_t snap_distance_;
 
 	unsigned int sticky_events_;
 	QTimer lazy_event_handler_;