X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=14217d25549de9ce45bfa7aeb733fc696866f3ff;hb=533b67b7af83c96af2692bac127b0023cca4dbe7;hp=a0e6f6bcc1d237689b3e6bb67afce9600b56166b;hpb=ccf6a266d9b911075512b4de16fe2ce2c2e767c4;p=pulseview.git

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index a0e6f6bc..14217d25 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>
 
@@ -95,27 +96,32 @@ private:
 	static const pv::util::Timestamp MinScale;
 
 	static const int MaxScrollValue;
+	static const int ViewScrollMargin;
 
 	static const int ScaleUnits[3];
 
 public:
-	explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr);
+	explicit View(Session &session, bool is_main_view=false, QMainWindow *parent = nullptr);
 
 	~View();
 
+	virtual ViewType get_type() const;
+
 	/**
 	 * 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;
+	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.
 	 */
-	unordered_set< shared_ptr<Signal> > signals() const;
+	vector< shared_ptr<Signal> > signals() const;
+
+	shared_ptr<Signal> get_signal_by_signalbase(shared_ptr<data::SignalBase> base) const;
 
 	virtual void clear_signals();
 
@@ -142,9 +148,10 @@ public:
 	virtual const View* view() const;
 
 	Viewport* viewport();
-
 	const Viewport* viewport() const;
 
+	QAbstractScrollArea* scrollarea() const;
+
 	const Ruler* ruler() const;
 
 	virtual void save_settings(QSettings &settings) const;
@@ -255,33 +262,17 @@ public:
 	 */
 	void set_scale_offset(double scale, const pv::util::Timestamp& offset);
 
-	set< shared_ptr<pv::data::SignalData> > get_visible_data() const;
+	vector< shared_ptr<pv::data::SignalData> > get_visible_data() const;
 
 	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.
+	 * Returns true if cursors are displayed, false otherwise.
 	 */
 	bool cursors_shown() const;
 
@@ -291,14 +282,16 @@ public:
 	void show_cursors(bool show = true);
 
 	/**
-	 * Sets the cursors to the given offsets. You will still have to call show_cursors separately.
+	 * Sets the cursors to the given offsets.
+	 * You 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.
+	 * You still have to call show_cursors() separately.
 	 */
-	void centre_cursors();
+	void center_cursors();
 
 	/**
 	 * Returns a reference to the pair of cursors.
@@ -438,13 +431,19 @@ public:
 	void extents_changed(bool horz, bool vert);
 
 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();
 
+	void on_grab_ruler(int ruler_id);
+
 	void signals_changed();
 	void capture_state_updated(int state);
 
@@ -506,7 +505,13 @@ private:
 	Header *header_;
 	QSplitter *splitter_;
 
-	unordered_set< shared_ptr<Signal> > signals_;
+	QShortcut *zoom_in_shortcut_, *zoom_in_shortcut_2_;
+	QShortcut *zoom_out_shortcut_, *zoom_out_shortcut_2_;
+	QShortcut *home_shortcut_, *end_shortcut_;
+	QShortcut *grab_ruler_left_shortcut_, *grab_ruler_right_shortcut_;
+	QShortcut *cancel_grab_shortcut_;
+
+	vector< shared_ptr<Signal> > signals_;
 
 #ifdef ENABLE_DECODE
 	vector< shared_ptr<DecodeTrace> > decode_traces_;
@@ -526,6 +531,8 @@ private:
 	pv::util::Timestamp ruler_offset_;
 	/// The offset of the zero point in seconds.
 	pv::util::Timestamp zero_offset_;
+	/// Shows whether the user set a custom zero offset that we should keep
+	bool custom_zero_offset_set_;
 
 	bool updating_scroll_;
 	bool settings_restored_;
@@ -550,6 +557,7 @@ private:
 	vector< shared_ptr<TriggerMarker> > trigger_markers_;
 
 	QWidget* hover_widget_;
+	TimeMarker* grabbed_widget_;
 	QPoint hover_point_;
 	shared_ptr<Signal> signal_under_mouse_cursor_;
 	uint16_t snap_distance_;