X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=da9f56ccb76d5546e0fc4baccc6413c729b56ab1;hp=e49d12292863766668627fe68cb10b51dc3b88ea;hb=9f97b3576f527239594ea0accb82a4087147c746;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;ds=sidebyside

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index e49d1229..da9f56cc 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>
@@ -51,6 +52,8 @@ class Session;
 namespace data {
 class DecoderStack;
 class SignalBase;
+struct DecodeChannel;
+class DecodeSignal;
 
 namespace decode {
 class Annotation;
@@ -70,15 +73,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;
@@ -98,8 +92,6 @@ public:
 
 	bool enabled() const;
 
-	const shared_ptr<pv::data::DecoderStack>& decoder() const;
-
 	shared_ptr<data::SignalBase> base() const;
 
 	/**
@@ -180,28 +172,23 @@ 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();
 
 private Q_SLOTS:
-	void on_new_decode_data();
+	void on_new_annotations();
 
 	void on_delete();
 
 	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);
 
@@ -211,13 +198,15 @@ private Q_SLOTS:
 
 private:
 	pv::Session &session_;
+	shared_ptr<data::DecodeSignal> decode_signal_;
 
 	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_;