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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 6f7182f..c12d5b5 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -23,6 +23,7 @@
 
 #include "trace.h"
 
+#include <list>
 #include <map>
 
 #include <boost/shared_ptr.hpp>
@@ -36,8 +37,12 @@ class QComboBox;
 namespace pv {
 
 namespace data {
+class DecoderStack;
+
+namespace decode {
 class Decoder;
 }
+}
 
 namespace view {
 
@@ -45,17 +50,26 @@ 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;
 
 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);
 
@@ -85,8 +99,16 @@ private:
 	void draw_error(QPainter &p, const QString &message,
 		int left, int right);
 
-	QComboBox* create_probe_selector(
-		QWidget *parent, const srd_probe *const probe);
+	void create_decoder_form(
+		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 +119,17 @@ private slots:
 
 	void on_probe_selected(int);
 
+	void on_stack_decoder(srd_decoder *decoder);
+
 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::map<const srd_probe*, QComboBox*> _probe_selector_map;
+	std::list<ProbeSelector> _probe_selectors;
 };
 
 } // namespace view