X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=8fdbc15d6a9d5e276ea87c4200c926bcc2143dbb;hp=4f364404ce01acf2c9f9b4ee18d8cfb2dc517843;hb=4eba9990f617cba59193c7df8e6359ea642ccb27;hpb=ff046cb6c42a2382ee281e83955b7ae44030b42e

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 4f364404..8fdbc15d 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;
 
@@ -131,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.
 	 */
@@ -145,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);
@@ -171,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();
 
@@ -276,6 +278,11 @@ public:
 	 */
 	void show_cursors(bool show = true);
 
+    /**
+     * Sets the cursors to the given offsets. You will still have to call show_cursors separately.
+     */
+    void set_cursors(pv::util::Timestamp& first, pv::util::Timestamp& second);
+
 	/**
 	 * Moves the cursors to a convenient position in the view.
 	 */
@@ -302,13 +309,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();
 
@@ -394,6 +413,8 @@ private:
 
 	bool eventFilter(QObject *object, QEvent *event);
 
+	virtual void contextMenuEvent(QContextMenuEvent *event);
+
 	void resizeEvent(QResizeEvent *event);
 
 	void update_hover_point();
@@ -491,6 +512,8 @@ private:
 	pv::util::Timestamp offset_;
 	/// The ruler version of the time offset in seconds.
 	pv::util::Timestamp ruler_offset_;
+	/// The offset of the zero point in seconds.
+	pv::util::Timestamp zero_offset_;
 
 	bool updating_scroll_;
 	bool settings_restored_;
@@ -514,7 +537,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_;