X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=c9582c61218409616c7119d1cc894f6ae0cecafd;hp=c0b94df26c00f86fbf61b5d673131e95a472165e;hb=9d4010c7f02b1c7575db2fb163b0d6daf323c1a9;hpb=97904bf71258d3b522b00eb3dcae1efea6bd1298

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index c0b94df2..c9582c61 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACE_H
-#define PULSEVIEW_PV_VIEW_TRACE_H
+#ifndef PULSEVIEW_PV_VIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEW_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -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,9 @@ private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
+	static const QColor BrightBGColour;
+	static const QColor DarkBGColour;
+
 protected:
 	Trace(QString name);
 
@@ -73,14 +76,25 @@ public:
 	 */
 	void set_colour(QColor colour);
 
+	/**
+	 * Enables or disables the coloured background for this trace.
+	 */
+	void set_coloured_bg(bool state);
+
+	/**
+	 * 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.
+	 */
+	QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
+
 	/**
 	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	virtual void paint_label(QPainter &p, int right, bool hover);
+	virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
 	virtual QMenu* create_context_menu(QWidget *parent);
 
@@ -88,21 +102,18 @@ public:
 
 	/**
 	 * Computes the outline rectangle of a label.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
 	 */
-	QRectF label_rect(int right) const;
+	QRectF label_rect(const QRectF &rect) const;
 
 protected:
-
 	/**
-	 * Gets the text colour.
-	 * @remarks This colour is computed by comparing the lightness
-	 * of the trace colour against a threshold to determine whether
-	 * white or black would be more visible.
+	 * 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.
 	 */
-	QColor get_text_colour() const;
+	virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints a zero axis across the viewport.
@@ -110,7 +121,7 @@ protected:
 	 * @param pp the painting parameters object to paint with.
 	 * @param y the y-offset of the axis.
 	 */
-	void paint_axis(QPainter &p, const RowItemPaintParams &pp, int y);
+	void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y);
 
 	void add_colour_option(QWidget *parent, QFormLayout *form);
 
@@ -127,7 +138,8 @@ private Q_SLOTS:
 
 protected:
 	QString name_;
-	QColor colour_;
+	QColor colour_, bgcolour_;
+	bool coloured_bg_, coloured_bg_state_;
 
 private:
 	pv::widgets::Popup *popup_;
@@ -137,4 +149,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_HPP