X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=ca9f9e96f652d7247d1856567990cb0c24f9914b;hb=30cdef99af65a04ee8c55ab816044c32f7e955ad;hp=cee4ccf0eadcf6db1a214483057231e4274c7dbf;hpb=462941e2626cef9855e810abdb0458e99ee1c5f1;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index cee4ccf0..ca9f9e96 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -26,8 +26,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include <QDebug>
 #include <QSettings>
-#include <QString>
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
@@ -77,11 +77,17 @@ struct DecodeBinaryClass
 
 struct DecodeSegment
 {
-	map<const Row*, RowData> annotation_rows;
+	// Constructor is a no-op
+	DecodeSegment() { };
+	// Copy constructor is a no-op
+	DecodeSegment(DecodeSegment&& ds) { (void)ds; qCritical() << "Empty DecodeSegment copy constructor called"; };
+
+	map<const Row*, RowData> annotation_rows;  // Note: Row is the same for all segments while RowData is not
 	pv::util::Timestamp start_time;
 	double samplerate;
 	int64_t samples_decoded_incl, samples_decoded_excl;
 	vector<DecodeBinaryClass> binary_classes;
+	deque<const Annotation*> all_annotations;
 };
 
 class DecodeSignal : public SignalBase
@@ -109,16 +115,17 @@ public:
 	void pause_decode();
 	void resume_decode();
 	bool is_paused() const;
-	QString error_message() const;
 
 	const vector<decode::DecodeChannel> get_channels() const;
 	void auto_assign_signals(const shared_ptr<Decoder> dec);
-	void assign_signal(const uint16_t channel_id, const SignalBase *signal);
+	void assign_signal(const uint16_t channel_id, shared_ptr<const SignalBase> signal);
 	int get_assigned_signal_count() const;
 
+	void update_output_signals();
+
 	void set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
-	double samplerate() const;
+	virtual double get_samplerate() const;
 	const pv::util::Timestamp start_time() const;
 
 	/**
@@ -176,15 +183,16 @@ public:
 	const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id,
 		const Decoder* dec, uint32_t bin_class_id) const;
 
+	const deque<const Annotation*>* get_all_annotations_by_segment(uint32_t segment_id) const;
+
 	virtual void save_settings(QSettings &settings) const;
 
 	virtual void restore_settings(QSettings &settings);
 
 private:
-	void set_error_message(QString msg);
-
+	bool all_input_segments_complete(uint32_t segment_id) const;
 	uint32_t get_input_segment_count() const;
-	uint32_t get_input_samplerate(uint32_t segment_id) const;
+	double get_input_samplerate(uint32_t segment_id) const;
 
 	Decoder* get_decoder_by_instance(const srd_decoder *const srd_dec);
 
@@ -196,7 +204,7 @@ private:
 	void logic_mux_proc();
 
 	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
-		const shared_ptr<LogicSegment> input_segment);
+		const shared_ptr<const LogicSegment> input_segment);
 	void decode_proc();
 
 	void start_srd_session();
@@ -204,11 +212,13 @@ private:
 	void stop_srd_session();
 
 	void connect_input_notifiers();
+	void disconnect_input_notifiers();
 
 	void create_decode_segment();
 
 	static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 	static void binary_callback(srd_proto_data *pdata, void *decode_signal);
+	static void logic_output_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
 	void decoder_stacked(void* decoder); ///< decoder is of type decode::Decoder*
@@ -218,11 +228,15 @@ Q_SIGNALS:
 	void decode_reset();
 	void decode_finished();
 	void channels_updated();
+	void annotation_visibility_changed();
 
 private Q_SLOTS:
 	void on_capture_state_changed(int state);
 	void on_data_cleared();
 	void on_data_received();
+	void on_input_segment_completed();
+
+	void on_annotation_visibility_changed();
 
 private:
 	pv::Session &session_;
@@ -238,7 +252,7 @@ private:
 	vector< shared_ptr<Decoder> > stack_;
 	bool stack_config_changed_;
 
-	vector<DecodeSegment> segments_;
+	deque<DecodeSegment> segments_;
 	uint32_t current_segment_id_;
 
 	mutable mutex input_mutex_, output_mutex_, decode_pause_mutex_, logic_mux_mutex_;
@@ -250,7 +264,8 @@ private:
 
 	bool decode_paused_;
 
-	QString error_message_;
+	map<const srd_decoder*, shared_ptr<Logic>> output_logic_;
+	vector< shared_ptr<SignalBase>> output_signals_;
 };
 
 } // namespace data