X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;fp=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=5c756b2645743738ee26682ea2772c755d0da018;hp=8d651d037dc3e824d930c1802b54f79bedb360c1;hb=bdb971404d30bae069a1f431a3ac4d7476d1fd38;hpb=5a9146acd1a3ec81ff74e108f50d5b2885ff21a1

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 8d651d03..5c756b26 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -96,6 +96,9 @@ struct DecodeTraceRow {
 	QWidget* header_container;
 	QWidget* selector_container;
 	vector<QCheckBox*> selectors;
+
+	QColor row_color;
+	map<uint32_t, QColor> ann_class_color;
 };
 
 class DecodeTrace : public Trace
@@ -168,24 +171,22 @@ public:
 
 private:
 	void draw_annotations(vector<const Annotation*> annotations, QPainter &p,
-		int h, const ViewItemPaintParams &pp, int y, QColor row_color,
-		int row_title_width);
+		const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row);
 
-	void draw_annotation(const Annotation* a, QPainter &p, int h,
-		const ViewItemPaintParams &pp, int y, QColor row_color,
-		int row_title_width) const;
+	void draw_annotation(const Annotation* a, QPainter &p,
+		const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) const;
 
 	void draw_annotation_block(qreal start, qreal end, Annotation::Class ann_class,
-		bool use_ann_format, QPainter &p, int h, int y, QColor row_color) const;
+		bool use_ann_format, QPainter &p, int y, const DecodeTraceRow& row) const;
 
-	void draw_instant(const Annotation* a, QPainter &p, int h, qreal x, int y) const;
+	void draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const;
 
-	void draw_range(const Annotation* a, QPainter &p, int h, qreal start, qreal end,
+	void draw_range(const Annotation* a, QPainter &p, qreal start, qreal end,
 		int y, const ViewItemPaintParams &pp, int row_title_width) const;
 
 	void draw_error(QPainter &p, const QString &message, const ViewItemPaintParams &pp);
 
-	void draw_unresolved_period(QPainter &p, int h, int left, int right) const;
+	void draw_unresolved_period(QPainter &p, int left, int right) const;
 
 	pair<double, double> get_pixels_offset_samples_per_pixel() const;