X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=692a5f710a3f653adfa93c8ebe6ba95a4ccc7e6b;hp=6ba48455fe88a964cf7268ae1fbf021523d23404;hb=9ba13f5e933f55f015e7c592980dfad14b4c66a8;hpb=5b6ae10391736ab2f81de851686dee15bbcbf9f9

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 6ba48455..692a5f71 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,8 +45,6 @@ using std::vector;
 struct srd_channel;
 struct srd_decoder;
 
-class QComboBox;
-
 namespace pv {
 
 class Session;
@@ -60,7 +59,7 @@ class Annotation;
 class Decoder;
 class Row;
 }
-}
+}  // namespace data
 
 namespace widgets {
 class DecoderGroupBox;
@@ -74,9 +73,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 +83,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 +127,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 +160,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);
@@ -179,11 +177,13 @@ private:
 		const data::DecodeChannel *ch);
 
 public:
-	void hover_point_changed();
+	void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
 	void on_new_annotations();
 	void on_delayed_trace_update();
+	void on_decode_reset();
+	void on_decode_finished();
 
 	void on_delete();