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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index c12d5b5..2df848a 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -26,11 +26,14 @@
 #include <list>
 #include <map>
 
+#include <QSignalMapper>
+
 #include <boost/shared_ptr.hpp>
 
 #include <pv/prop/binding/decoderoptions.h>
 
 struct srd_probe;
+struct srd_decoder;
 
 class QComboBox;
 
@@ -40,6 +43,7 @@ namespace data {
 class DecoderStack;
 
 namespace decode {
+class Annotation;
 class Decoder;
 }
 }
@@ -61,6 +65,12 @@ private:
 private:
 	static const QColor DecodeColours[4];
 	static const QColor ErrorBgColour;
+	static const QColor NoDecodeColour;
+
+	static const double EndCapWidth;
+	static const int DrawPadding;
+
+	static const QColor Colours[7];
 
 public:
 	DecodeTrace(pv::SigSession &session,
@@ -96,10 +106,25 @@ public:
 	void delete_pressed();
 
 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;
+
+	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
+		QColor fill, QColor outline, QColor text_color, int h, double x,
+		int y) const;
+
+	void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
+		QColor fill, QColor outline, QColor text_color, int h, double start,
+		double end, int y) const;
+
 	void draw_error(QPainter &p, const QString &message,
 		int left, int right);
 
-	void create_decoder_form(
+	void draw_unresolved_period(QPainter &p, int h, int left,
+		int right, double samples_per_pixel, double pixels_offset);
+
+	void create_decoder_form(int index,
 		boost::shared_ptr<pv::data::decode::Decoder> &dec,
 		QWidget *parent, QFormLayout *form);
 
@@ -121,6 +146,8 @@ private slots:
 
 	void on_stack_decoder(srd_decoder *decoder);
 
+	void on_delete_decoder(int index);
+
 private:
 	boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
@@ -130,6 +157,8 @@ private:
 		_bindings;
 
 	std::list<ProbeSelector> _probe_selectors;
+
+	QSignalMapper _delete_mapper;
 };
 
 } // namespace view