X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=00fe7f424cc5a12bcaf2bdc78a2a0dc7a689f23c;hp=43473873444f01ba3f786b3c1fcd63b084215f70;hb=808d1a7e63b957cf0b873294e53d7fd76b5e41b9;hpb=eee3eab96253315b2a3dc04ffa7051a8ec963c32

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 43473873..00fe7f42 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -27,6 +27,7 @@
 #include <memory>
 #include <vector>
 
+#include <QColor>
 #include <QComboBox>
 #include <QSignalMapper>
 #include <QTimer>
@@ -44,21 +45,16 @@ using std::vector;
 struct srd_channel;
 struct srd_decoder;
 
-class QComboBox;
-
 namespace pv {
 
 class Session;
 
 namespace data {
-class SignalBase;
 struct DecodeChannel;
 class DecodeSignal;
 
 namespace decode {
-class Annotation;
 class Decoder;
-class Row;
 }
 }  // namespace data
 
@@ -74,9 +70,8 @@ class DecodeTrace : public Trace
 	Q_OBJECT
 
 private:
-	static const QColor DecodeColours[4];
-	static const QColor ErrorBgColour;
-	static const QColor NoDecodeColour;
+	static const QColor ErrorBgColor;
+	static const QColor NoDecodeColor;
 
 	static const int ArrowSize;
 	static const double EndCapWidth;
@@ -85,9 +80,6 @@ private:
 
 	static const int MaxTraceUpdateRate;
 
-	static const QColor Colours[16];
-	static const QColor OutlineColours[16];
-
 public:
 	DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
 		int index);
@@ -132,14 +124,14 @@ public:
 private:
 	void draw_annotations(vector<pv::data::decode::Annotation> annotations,
 		QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-		size_t base_colour, int row_title_width);
+		QColor row_color, int row_title_width);
 
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
 		int h, const ViewItemPaintParams &pp, int y,
-		size_t base_colour, int row_title_width) const;
+		QColor row_color, int row_title_width) const;
 
 	void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
-		QPainter &p, int h, int y, size_t base_colour) const;
+		QPainter &p, int h, int y, QColor row_color) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
 		int h, double x, int y) const;
@@ -165,6 +157,9 @@ private:
 	 */
 	pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
 
+	QColor get_row_color(int row_index) const;
+	QColor get_annotation_color(QColor row_color, int annotation_index) const;
+
 	int get_row_at_point(const QPoint &point);
 
 	const QString get_annotation_at_point(const QPoint &point);
@@ -206,7 +201,6 @@ private:
 	shared_ptr<data::DecodeSignal> decode_signal_;
 
 	vector<data::decode::Row> visible_rows_;
-	uint64_t decode_start_, decode_end_;
 
 	map<QComboBox*, uint16_t> channel_id_map_;  // channel selector -> decode channel ID
 	map<QComboBox*, uint16_t> init_state_map_;  // init state selector -> decode channel ID