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

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index e53e2b8..410ea62 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -27,7 +27,9 @@
 #include <memory>
 #include <vector>
 
+#include <QComboBox>
 #include <QSignalMapper>
+#include <QTimer>
 
 #include <pv/binding/decoder.hpp>
 #include <pv/data/decode/row.hpp>
@@ -49,8 +51,8 @@ namespace pv {
 class Session;
 
 namespace data {
-class DecoderStack;
 class SignalBase;
+struct DecodeChannel;
 class DecodeSignal;
 
 namespace decode {
@@ -58,7 +60,7 @@ class Annotation;
 class Decoder;
 class Row;
 }
-}
+}  // namespace data
 
 namespace widgets {
 class DecoderGroupBox;
@@ -72,26 +74,19 @@ 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;
-	static const QColor NoDecodeColour;
+	static const QColor DecodeColors[4];
+	static const QColor ErrorBgColor;
+	static const QColor NoDecodeColor;
 
 	static const int ArrowSize;
 	static const double EndCapWidth;
 	static const int RowTitleMargin;
 	static const int DrawPadding;
 
-	static const QColor Colours[16];
-	static const QColor OutlineColours[16];
+	static const int MaxTraceUpdateRate;
+
+	static const QColor Colors[16];
+	static const QColor OutlineColors[16];
 
 public:
 	DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
@@ -99,8 +94,6 @@ public:
 
 	bool enabled() const;
 
-	const shared_ptr<pv::data::DecoderStack>& decoder() const;
-
 	shared_ptr<data::SignalBase> base() const;
 
 	/**
@@ -139,14 +132,14 @@ public:
 private:
 	void draw_annotations(vector<pv::data::decode::Annotation> annotations,
 		QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-		size_t base_colour, int row_title_width);
+		size_t base_color, int row_title_width);
 
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
 		int h, const ViewItemPaintParams &pp, int y,
-		size_t base_colour, int row_title_width) const;
+		size_t base_color, int row_title_width) const;
 
 	void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
-		QPainter &p, int h, int y, size_t base_colour) const;
+		QPainter &p, int h, int y, size_t base_color) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
 		int h, double x, int y) const;
@@ -181,28 +174,26 @@ 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();
+	void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
 	void on_new_annotations();
+	void on_delayed_trace_update();
+	void on_decode_reset();
+	void on_decode_finished();
 
 	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);
 
@@ -217,9 +208,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_;
@@ -228,6 +220,8 @@ private:
 	int min_useful_label_width_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;
+
+	QTimer delayed_trace_updater_;
 };
 
 } // namespace trace