X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=4e95f5654724945e25093d8e7d407ca5e74a2ca4;hp=7d0b8a09deb51b6d693782b4e4d4de19ad3fe2a2;hb=219b3ab99786d31cfbf010b931293c57daedacc9;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 7d0b8a09..4e95f565 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
 
 class QFormLayout;
 
@@ -41,7 +41,7 @@ class Popup;
 
 namespace view {
 
-class Trace : public RowItem
+class Trace : public TraceTreeItem
 {
 	Q_OBJECT
 
@@ -49,6 +49,10 @@ private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
+	static const int ColourBGAlpha;
+	static const QColor BrightGrayBGColour;
+	static const QColor DarkGrayBGColour;
+
 protected:
 	Trace(QString name);
 
@@ -74,11 +78,9 @@ public:
 	void set_colour(QColor colour);
 
 	/**
-	 * Computes the outline rectangle of the viewport hit-box.
-	 * @param rect the rectangle of the viewport area.
-	 * @return Returns the rectangle of the hit-box.
+	 * Enables or disables the coloured background for this trace.
 	 */
-	QRectF hit_box_rect(const QRectF &rect) const;
+	void set_coloured_bg(bool state);
 
 	/**
 	 * Paints the signal label.
@@ -100,6 +102,13 @@ public:
 	QRectF label_rect(const QRectF &rect) const;
 
 protected:
+	/**
+	 * Paints the background layer of the signal with a QPainter.
+	 * @param p The QPainter to paint into.
+	 * @param pp The painting parameters object to paint with.
+	 */
+	virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+
 	/**
 	 * Paints a zero axis across the viewport.
 	 * @param p the QPainter to paint into.
@@ -123,7 +132,8 @@ private Q_SLOTS:
 
 protected:
 	QString name_;
-	QColor colour_;
+	QColor colour_, bgcolour_;
+	bool coloured_bg_, coloured_bg_state_;
 
 private:
 	pv::widgets::Popup *popup_;