X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=09f3c2ee020f25befb08f6c954434df11a7676f2;hp=ed1c92633da5348384e6f4081f185448986656df;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=d001f416aec37d5b13b804dec9ee9e1c011ffabb

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index ed1c9263..09f3c2ee 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -38,7 +38,7 @@
 
 #include "cursorpair.hpp"
 #include "flag.hpp"
-#include "rowitemowner.hpp"
+#include "tracetreeitemowner.hpp"
 
 namespace sigrok {
 class ChannelGroup;
@@ -55,14 +55,15 @@ class Header;
 class Ruler;
 class Trace;
 class Viewport;
+class TriggerMarker;
 
-class View : public QAbstractScrollArea, public RowItemOwner {
+class View : public QAbstractScrollArea, public TraceTreeItemOwner {
 	Q_OBJECT
 
 private:
 	enum StickyEvents {
-		RowItemHExtentsChanged = 1,
-		RowItemVExtentsChanged = 2
+		TraceTreeItemHExtentsChanged = 1,
+		TraceTreeItemVExtentsChanged = 2
 	};
 
 private:
@@ -133,7 +134,7 @@ public:
 	/**
 	 * Returns period of the graticule time markings.
 	 */
-	double tick_period() const;
+	const pv::util::Timestamp& tick_period() const;
 
 	/**
 	 * Returns the unit of time currently used.
@@ -170,6 +171,12 @@ public:
 	 */
 	void enable_sticky_scrolling(bool state);
 
+	/**
+	 * Enables or disables coloured trace backgrounds. If they're not
+	 * coloured then they will use alternating colors.
+	 */
+	void enable_coloured_bg(bool state);
+
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
 	 */
@@ -209,19 +216,38 @@ public:
 
 	void update_viewport();
 
-	void restack_all_row_items();
+	void restack_all_trace_tree_items();
 
 Q_SIGNALS:
 	void hover_point_changed();
 
 	void selection_changed();
 
-	void scale_offset_changed();
+	/// Emitted when the offset changed.
+	void offset_changed();
+
+	/// Emitted when the scale changed.
+	void scale_changed();
 
 	void sticky_scrolling_changed(bool state);
 
 	void always_zoom_to_fit_changed(bool state);
 
+	/// Emitted when the tick_prefix changed.
+	void tick_prefix_changed();
+
+	/// Emitted when the tick_precision changed.
+	void tick_precision_changed();
+
+	/// Emitted when the tick_period changed.
+	void tick_period_changed();
+
+	/// Emitted when the time_unit changed.
+	void time_unit_changed();
+
+public Q_SLOTS:
+	void trigger_event(util::Timestamp location);
+
 private:
 	void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
 
@@ -244,7 +270,7 @@ private:
 	void update_layout();
 
 	/**
-	 * Satisifies RowItem functionality.
+	 * Satisifies TraceTreeItem functionality.
 	 * @param p the QPainter to paint into.
 	 * @param rect the rectangle of the header area.
 	 * @param hover true if the label is being hovered over by the mouse.
@@ -258,7 +284,7 @@ private:
 	 */
 	QRectF label_rect(const QRectF &rect);
 
-	RowItemOwner* find_prevalent_trace_group(
+	TraceTreeItemOwner* find_prevalent_trace_group(
 		const std::shared_ptr<sigrok::ChannelGroup> &group,
 		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
 			std::shared_ptr<Signal> > &signal_map);
@@ -272,12 +298,11 @@ private:
 
 	void determine_time_unit();
 
-private:
 	bool eventFilter(QObject *object, QEvent *event);
 
-	bool viewportEvent(QEvent *e);
+	bool viewportEvent(QEvent *event);
 
-	void resizeEvent(QResizeEvent *e);
+	void resizeEvent(QResizeEvent *event);
 
 public:
 	void row_item_appearance_changed(bool label, bool content);
@@ -300,6 +325,42 @@ private Q_SLOTS:
 
 	void on_hover_point_changed();
 
+	/**
+	 * Sets the 'offset_' member and emits the 'offset_changed'
+	 * signal if needed.
+	 */
+	void set_offset(const pv::util::Timestamp& offset);
+
+	/**
+	 * Sets the 'scale_' member and emits the 'scale_changed'
+	 * signal if needed.
+	 */
+	void set_scale(double scale);
+
+	/**
+	 * Sets the 'tick_prefix_' member and emits the 'tick_prefix_changed'
+	 * signal if needed.
+	 */
+	void set_tick_prefix(pv::util::SIPrefix tick_prefix);
+
+	/**
+	 * Sets the 'tick_precision_' member and emits the 'tick_precision_changed'
+	 * signal if needed.
+	 */
+	void set_tick_precision(unsigned tick_precision);
+
+	/**
+	 * Sets the 'tick_period_' member and emits the 'tick_period_changed'
+	 * signal if needed.
+	 */
+	void set_tick_period(const pv::util::Timestamp& tick_period);
+
+	/**
+	 * Sets the 'time_unit' member and emits the 'time_unit_changed'
+	 * signal if needed.
+	 */
+	void set_time_unit(pv::util::TimeUnit time_unit);
+
 private:
 	Session &session_;
 
@@ -318,7 +379,7 @@ private:
 	bool always_zoom_to_fit_;
 	QTimer delayed_view_updater_;
 
-	double tick_period_;
+	pv::util::Timestamp tick_period_;
 	pv::util::SIPrefix tick_prefix_;
 	unsigned int tick_precision_;
 	util::TimeUnit time_unit_;
@@ -329,6 +390,8 @@ private:
 	std::list< std::shared_ptr<Flag> > flags_;
 	char next_flag_text_;
 
+	std::vector< std::shared_ptr<TriggerMarker> > trigger_markers_;
+
 	QPoint hover_point_;
 
 	unsigned int sticky_events_;