X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.h;h=08558c98091af6668dca55c992df1784ee51c595;hb=83c23cc9fa0d4501d9e6b8759251fa6337f5d491;hp=bdcb4afe3ff1c350cd1002787ce942377e59e850;hpb=dd048a7ec035447c051c7937ce04aca5be065b4e;p=pulseview.git

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index bdcb4af..08558c9 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -39,12 +39,15 @@ class QComboBox;
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class DecoderStack;
 
 namespace decode {
 class Annotation;
 class Decoder;
+class Row;
 }
 }
 
@@ -74,7 +77,8 @@ private:
 	static const double EndCapWidth;
 	static const int DrawPadding;
 
-	static const QColor Colours[7];
+	static const QColor Colours[16];
+	static const QColor OutlineColours[16];
 
 public:
 	DecodeTrace(pv::SigSession &session,
@@ -113,7 +117,7 @@ private:
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
 		QColor text_colour, int text_height, int left, int right,
 		double samples_per_pixel, double pixels_offset, int y,
-		unsigned int row_index) const;
+		size_t base_colour) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
 		QColor fill, QColor outline, QColor text_color, int h, double x,
@@ -156,6 +160,7 @@ private slots:
 	void on_show_hide_decoder(int index);
 
 private:
+	pv::SigSession &_session;
 	boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
 	uint64_t _decode_start, _decode_end;