X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.h;h=642f2a0ed4394cec7d2c90f67548f4d027e0396b;hp=9f0e68b5deee5cd8fc0229f9182c2d526d4d11b4;hb=88908838c9682423c83da4cf1ab07e3aa43fc47e;hpb=bf51365c1ff176d5ecb6a2a1f3da09cb1086ea46

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 9f0e68b5..642f2a0e 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 {
@@ -67,10 +74,12 @@ private:
 	static const QColor ErrorBgColour;
 	static const QColor NoDecodeColour;
 
+	static const int ArrowSize;
 	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,
@@ -99,6 +108,14 @@ public:
 	 **/
 	void paint_mid(QPainter &p, int left, int right);
 
+	/**
+	 * Paints the foreground layer of the trace with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param left the x-coordinate of the left edge of the signal
+	 * @param right the x-coordinate of the right edge of the signal
+	 **/
+	void paint_fore(QPainter &p, int left, int right);
+
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 	QMenu* create_context_menu(QWidget *parent);
@@ -109,7 +126,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,
@@ -149,7 +166,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;
@@ -158,8 +178,11 @@ private:
 		_bindings;
 
 	std::list<ProbeSelector> _probe_selectors;
+	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
+
+	std::vector<QString> _cur_row_headings;
 
-	QSignalMapper _delete_mapper;
+	QSignalMapper _delete_mapper, _show_hide_mapper;
 };
 
 } // namespace view