X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.h;h=08558c98091af6668dca55c992df1784ee51c595;hb=e183f4e328db8bb134652254ba9bf0707dc16c66;hp=2df848acbba38110c95d4018b9d48be33ceddf8a;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;p=pulseview.git

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 2df848a..08558c9 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -39,13 +39,20 @@ class QComboBox;
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class DecoderStack;
 
 namespace decode {
 class Annotation;
 class Decoder;
+class Row;
+}
 }
+
+namespace widgets {
+class DecoderGroupBox;
 }
 
 namespace view {
@@ -70,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,
@@ -108,7 +116,8 @@ public:
 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) const;
+		double samples_per_pixel, double pixels_offset, int y,
+		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,
@@ -148,7 +157,10 @@ private slots:
 
 	void on_delete_decoder(int index);
 
+	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;
@@ -157,8 +169,9 @@ private:
 		_bindings;
 
 	std::list<ProbeSelector> _probe_selectors;
+	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
-	QSignalMapper _delete_mapper;
+	QSignalMapper _delete_mapper, _show_hide_mapper;
 };
 
 } // namespace view