X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=82a2f728116608555cee5b6ebb6a5001c30abd9b;hb=8ba6f8b7541409dd33fd4ddd1b51494f555773c9;hp=8f59b02927cd62c218d1d84c2603e124c326a69e;hpb=4468ee4246cd5e47845494e8b3b22a17d434ed5b;p=pulseview.git

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 8f59b029..82a2f728 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.
@@ -189,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.
 	 */
@@ -249,27 +260,11 @@ public:
 
 	pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
-	/**
-	 * Enables or disables colored trace backgrounds. If they're not
-	 * colored then they will use alternating colors.
-	 */
-	void enable_colored_bg(bool state);
-
 	/**
 	 * Returns true if the trace background should be drawn with a colored background.
 	 */
 	bool colored_bg() const;
 
-	/**
-	 * Enable or disable showing sampling points.
-	 */
-	void enable_show_sampling_points(bool state);
-
-	/**
-	 * Enable or disable showing the analog minor grid.
-	 */
-	void enable_show_analog_minor_grid(bool state);
-
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
 	 */
@@ -298,7 +293,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.
@@ -432,6 +427,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();
 
@@ -496,6 +496,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