X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=6c8ff3d1075d3e42d54ab8c478881fe86e2622a5;hb=2bdc5796c866b9494b2c40051e973e4385d9c46f;hp=4bde31d6dd17e3f6a5dd417a3397ebb98a3ded77;hpb=f6b6c9bf50999dc99f9517318ffd3114cae4960f;p=pulseview.git

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 4bde31d6..6c8ff3d1 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include <QAbstractScrollArea>
+#include <QShortcut>
 #include <QSizeF>
 #include <QSplitter>
 
@@ -109,8 +110,8 @@ public:
 	 */
 	virtual void reset_view_state();
 
-	Session& session();
-	const Session& session() const;
+	Session& session();  // This method is needed for TraceTreeItemOwner, not ViewBase
+	const Session& session() const;  // This method is needed for TraceTreeItemOwner, not ViewBase
 
 	/**
 	 * Returns the signals contained in this view.
@@ -145,6 +146,8 @@ public:
 
 	const Viewport* viewport() const;
 
+	const Ruler* ruler() const;
+
 	virtual void save_settings(QSettings &settings) const;
 
 	virtual void restore_settings(QSettings &settings);
@@ -171,10 +174,12 @@ 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 zero_offset() const;
+
 	/**
 	 * Returns the vertical scroll offset.
 	 */
@@ -185,6 +190,16 @@ public:
 	 */
 	void set_v_offset(int offset);
 
+	/**
+	 * Sets the visual h-offset.
+	 */
+	void set_h_offset(int offset);
+
+	/**
+	 * Gets the length of the horizontal scrollbar.
+	 */
+	int get_h_scrollbar_maximum() const;
+
 	/**
 	 * Returns the SI prefix to apply to the graticule time markings.
 	 */
@@ -276,6 +291,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.
 	 */
@@ -289,7 +309,7 @@ public:
 	/**
 	 * Adds a new flag at a specified time.
 	 */
-	void add_flag(const pv::util::Timestamp& time);
+	shared_ptr<Flag> add_flag(const pv::util::Timestamp& time);
 
 	/**
 	 * Removes a flag from the list.
@@ -302,6 +322,7 @@ 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
@@ -319,7 +340,7 @@ public:
 	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();
 
@@ -422,6 +443,11 @@ private Q_SLOTS:
 	void on_signal_name_changed();
 	void on_splitter_moved();
 
+	void on_zoom_in_shortcut_triggered();
+	void on_zoom_out_shortcut_triggered();
+	void on_scroll_to_start_shortcut_triggered();
+	void on_scroll_to_end_shortcut_triggered();
+
 	void h_scroll_value_changed(int value);
 	void v_scroll_value_changed();
 
@@ -486,6 +512,10 @@ private:
 	Header *header_;
 	QSplitter *splitter_;
 
+	QShortcut *zoom_in_shortcut_, *zoom_in_shortcut_2_;
+	QShortcut *zoom_out_shortcut_, *zoom_out_shortcut_2_;
+	QShortcut *home_shortcut_, *end_shortcut_;
+
 	unordered_set< shared_ptr<Signal> > signals_;
 
 #ifdef ENABLE_DECODE
@@ -504,6 +534,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_;
@@ -527,6 +559,7 @@ private:
 
 	vector< shared_ptr<TriggerMarker> > trigger_markers_;
 
+	QWidget* hover_widget_;
 	QPoint hover_point_;
 	shared_ptr<Signal> signal_under_mouse_cursor_;
 	uint16_t snap_distance_;