X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=06b2cf2fb6275f2cd51f55e8b5a43007ff0d757c;hp=a351fd9306332f0169e917c16c6bbf2246a07368;hb=39173000c5d0d164c52443d16a1dc434d538b198;hpb=d0c0573b3ee694827a747727f862c5f91736ca05

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index a351fd93..06b2cf2f 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,10 +173,13 @@ 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();
 
+    pv::util::Timestamp absolute_to_ruler_time(const pv::util::Timestamp& abs_time) const;
+    pv::util::Timestamp ruler_to_absolute_time(const pv::util::Timestamp& ruler_time) const;
+
 	/**
 	 * Returns the vertical scroll offset.
 	 */
@@ -228,8 +239,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.
@@ -242,15 +251,15 @@ public:
 	pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
 	/**
-	 * Enables or disables coloured trace backgrounds. If they're not
-	 * coloured then they will use alternating colors.
+	 * Enables or disables colored trace backgrounds. If they're not
+	 * colored then they will use alternating colors.
 	 */
-	void enable_coloured_bg(bool state);
+	void enable_colored_bg(bool state);
 
 	/**
-	 * Returns true if the trace background should be drawn with a coloured background.
+	 * Returns true if the trace background should be drawn with a colored background.
 	 */
-	bool coloured_bg() const;
+	bool colored_bg() const;
 
 	/**
 	 * Enable or disable showing sampling points.
@@ -272,6 +281,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.
 	 */
@@ -298,13 +312,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 +363,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 +416,8 @@ private:
 
 	bool eventFilter(QObject *object, QEvent *event);
 
+	virtual void contextMenuEvent(QContextMenuEvent *event);
+
 	void resizeEvent(QResizeEvent *event);
 
 	void update_hover_point();
@@ -484,13 +515,15 @@ 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_;
 	bool header_was_shrunk_;
 
 	bool sticky_scrolling_;
-	bool coloured_bg_;
+	bool colored_bg_;
 	bool always_zoom_to_fit_;
 
 	pv::util::Timestamp tick_period_;
@@ -507,7 +540,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_;