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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 6f7182f4..9f0e68b5 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -23,21 +23,30 @@
 
 #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;
 
 namespace pv {
 
 namespace data {
+class DecoderStack;
+
+namespace decode {
+class Annotation;
 class Decoder;
 }
+}
 
 namespace view {
 
@@ -45,17 +54,32 @@ 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,
-		boost::shared_ptr<pv::data::Decoder> decoder, int index);
+		boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
+		int index);
 
 	bool enabled() const;
 
-	const boost::shared_ptr<pv::data::Decoder>& decoder() const;
+	const boost::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
 	void set_view(pv::view::View *view);
 
@@ -82,11 +106,35 @@ 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,
+		unsigned int row_index) 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();
 
@@ -97,14 +145,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::Decoder> _decoder;
+	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