X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=a3610b74114246e7d94aae69859c7f805275cd85;hp=9bb42ef14ea6e239500482698c81f95994c94cc9;hb=9e8f0e503e0c79c3765947ba5abae0ffc76850c4;hpb=48257a69ffad409c9893605d99cd6e15161dff4f

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 9bb42ef1..a3610b74 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -55,6 +55,7 @@ class Header;
 class Ruler;
 class Trace;
 class Viewport;
+class TriggerMarker;
 
 class View : public QAbstractScrollArea, public TraceTreeItemOwner {
 	Q_OBJECT
@@ -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.
 	 */
@@ -207,8 +214,6 @@ public:
 
 	const QPoint& hover_point() const;
 
-	void update_viewport();
-
 	void restack_all_trace_tree_items();
 
 Q_SIGNALS:
@@ -260,22 +265,11 @@ private:
 
 	void update_scroll();
 
-	void update_layout();
+	void reset_scroll();
 
-	/**
-	 * 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.
-	 */
-	void paint_label(QPainter &p, const QRect &rect, bool hover);
+	void set_scroll_default();
 
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param rect the rectangle of the header area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	QRectF label_rect(const QRectF &rect);
+	void update_layout();
 
 	TraceTreeItemOwner* find_prevalent_trace_group(
 		const std::shared_ptr<sigrok::ChannelGroup> &group,
@@ -293,9 +287,9 @@ 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);
@@ -383,10 +377,15 @@ 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_;
 	QTimer lazy_event_handler_;
+
+	// This is true when the defaults couldn't be set due to insufficient info
+	bool scroll_needs_defaults;
 };
 
 } // namespace view