X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=55c3f3b5c47a80edbdff1e4dfab92e723cfda3a8;hp=fe3503b6008817b4d47b9fc0b10ffe47d3ab9d01;hb=5c48ce328b0b049d0ddc1b137f20118c9084c929;hpb=873e80357d9622678069fcfe83b010717a68284c

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index fe3503b6..55c3f3b5 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -27,11 +27,13 @@
 #include <memory>
 #include <vector>
 
+#include <QColor>
 #include <QComboBox>
 #include <QSignalMapper>
 #include <QTimer>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/decode/annotation.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
 
@@ -44,21 +46,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 +71,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 +81,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,20 +125,21 @@ 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;
+	void draw_annotation_block(qreal start, qreal end,
+		pv::data::decode::Annotation::Class ann_class, bool use_ann_format,
+		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;
+		int h, qreal x, int y) const;
 
 	void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-		int h, double start, double end, int y, const ViewItemPaintParams &pp,
+		int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp,
 		int row_title_width) const;
 
 	void draw_error(QPainter &p, const QString &message,
@@ -165,6 +159,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);
@@ -184,6 +181,7 @@ public:
 private Q_SLOTS:
 	void on_new_annotations();
 	void on_delayed_trace_update();
+	void on_decode_reset();
 	void on_decode_finished();
 
 	void on_delete();
@@ -205,7 +203,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