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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 229df86..2df848a 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -23,13 +23,17 @@
 
 #include "trace.h"
 
+#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;
 
@@ -37,6 +41,11 @@ namespace pv {
 
 namespace data {
 class DecoderStack;
+
+namespace decode {
+class Annotation;
+class Decoder;
+}
 }
 
 namespace view {
@@ -45,9 +54,23 @@ class DecodeTrace : public Trace
 {
 	Q_OBJECT
 
+private:
+	struct ProbeSelector
+	{
+		const QComboBox *_combo;
+		const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
+		const srd_probe *_probe;
+	};
+
 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,
@@ -83,11 +106,34 @@ 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);
 
-	QComboBox* create_probe_selector(
-		QWidget *parent, const srd_probe *const probe);
+	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);
+
+	QComboBox* create_probe_selector(QWidget *parent,
+		const boost::shared_ptr<pv::data::decode::Decoder> &dec,
+		const srd_probe *const probe);
+
+	void commit_decoder_probes(
+		boost::shared_ptr<data::decode::Decoder> &dec);
 
 	void commit_probes();
 
@@ -98,14 +144,21 @@ private slots:
 
 	void on_probe_selected(int);
 
+	void on_stack_decoder(srd_decoder *decoder);
+
+	void on_delete_decoder(int index);
+
 private:
 	boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
 	uint64_t _decode_start, _decode_end;
 
-	pv::prop::binding::DecoderOptions _binding;
+	std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >
+		_bindings;
+
+	std::list<ProbeSelector> _probe_selectors;
 
-	std::map<const srd_probe*, QComboBox*> _probe_selector_map;
+	QSignalMapper _delete_mapper;
 };
 
 } // namespace view