X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=7edb30bde3c96b6591e1190d080a7b368e4862c4;hb=ff83d98059f06ac8f57be080ab53e7095aa4748b;hp=e53e2b802b7585e0b31360c169dd34f2b9b21302;hpb=ad908057e13224eee9f983685e0ccc7db1ded0e9;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index e53e2b8..7edb30b 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -27,6 +27,7 @@
 #include <memory>
 #include <vector>
 
+#include <QComboBox>
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>
@@ -49,8 +50,8 @@ namespace pv {
 class Session;
 
 namespace data {
-class DecoderStack;
 class SignalBase;
+struct DecodeChannel;
 class DecodeSignal;
 
 namespace decode {
@@ -71,15 +72,6 @@ class DecodeTrace : public Trace
 {
 	Q_OBJECT
 
-private:
-	struct ChannelSelector
-	{
-		const QComboBox *combo_;
-		const QComboBox *combo_initial_pin_;
-		const shared_ptr<pv::data::decode::Decoder> decoder_;
-		const srd_channel *pdch_;
-	};
-
 private:
 	static const QColor DecodeColours[4];
 	static const QColor ErrorBgColour;
@@ -99,8 +91,6 @@ public:
 
 	bool enabled() const;
 
-	const shared_ptr<pv::data::DecoderStack>& decoder() const;
-
 	shared_ptr<data::SignalBase> base() const;
 
 	/**
@@ -181,16 +171,9 @@ private:
 		QWidget *parent, QFormLayout *form);
 
 	QComboBox* create_channel_selector(QWidget *parent,
-		const shared_ptr<pv::data::decode::Decoder> &dec,
-		const srd_channel *const pdch);
-
-	QComboBox* create_channel_selector_initial_pin(QWidget *parent,
-		const shared_ptr<pv::data::decode::Decoder> &dec,
-		const srd_channel *const pdch);
-
-	void commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec);
-
-	void commit_channels();
+		const data::DecodeChannel *ch);
+	QComboBox* create_channel_selector_init_state(QWidget *parent,
+		const data::DecodeChannel *ch);
 
 public:
 	void hover_point_changed();
@@ -202,7 +185,9 @@ private Q_SLOTS:
 
 	void on_channel_selected(int);
 
-	void on_initial_pin_selected(int);
+	void on_channels_updated();
+
+	void on_init_state_changed(int);
 
 	void on_stack_decoder(srd_decoder *decoder);
 
@@ -217,9 +202,10 @@ private:
 	vector<data::decode::Row> visible_rows_;
 	uint64_t decode_start_, decode_end_;
 
+	map<QComboBox*, uint16_t> channel_id_map_;  // channel selector -> decode channel ID
+	map<QComboBox*, uint16_t> init_state_map_;  // init state selector -> decode channel ID
 	list< shared_ptr<pv::binding::Decoder> > bindings_;
 
-	list<ChannelSelector> channel_selectors_;
 	vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
 	map<data::decode::Row, int> row_title_widths_;