X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=2a6d125f06024dd14494097f834a00d6f44bd8fc;hp=f3ef9dfaad15a73fe5147c69dbae844647b4e67c;hb=HEAD;hpb=cbb2e4da8042495531b406f745ee9d9e20448ef6

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index f3ef9dfa..333e953b 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>
 
@@ -42,21 +42,21 @@ using std::condition_variable;
 using std::deque;
 using std::map;
 using std::mutex;
-using std::pair;
 using std::vector;
 using std::shared_ptr;
 
+using pv::data::decode::Annotation;
+using pv::data::decode::DecodeBinaryClassInfo;
+using pv::data::decode::DecodeChannel;
+using pv::data::decode::Decoder;
+using pv::data::decode::Row;
+using pv::data::decode::RowData;
+
 namespace pv {
 class Session;
 
 namespace data {
 
-namespace decode {
-class Annotation;
-class Decoder;
-class Row;
-}
-
 class Logic;
 class LogicSegment;
 class SignalBase;
@@ -70,18 +70,24 @@ struct DecodeBinaryDataChunk
 
 struct DecodeBinaryClass
 {
-	const decode::Decoder* decoder;
-	const decode::DecodeBinaryClassInfo* info;
+	const Decoder* decoder;
+	const DecodeBinaryClassInfo* info;
 	deque<DecodeBinaryDataChunk> chunks;
 };
 
 struct DecodeSegment
 {
-	map<const decode::Row, decode::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
@@ -97,8 +103,18 @@ public:
 	DecodeSignal(pv::Session &session);
 	virtual ~DecodeSignal();
 
+	/**
+	 * Sets the name of the signal.
+	 */
+	virtual void set_name(QString name);
+
+	/**
+	 * Set the color of the signal.
+	 */
+	virtual void set_color(QColor color);
+
 	bool is_decode_signal() const;
-	const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
+	const vector< shared_ptr<Decoder> >& decoder_stack() const;
 
 	void stack_decoder(const srd_decoder *decoder, bool restart_decode=true);
 	void remove_decoder(int index);
@@ -109,16 +125,17 @@ public:
 	void pause_decode();
 	void resume_decode();
 	bool is_paused() const;
-	QString error_message() const;
 
-	const vector<data::decode::DecodeChannel> get_channels() const;
-	void auto_assign_signals(const shared_ptr<pv::data::decode::Decoder> dec);
-	void assign_signal(const uint16_t channel_id, const SignalBase *signal);
+	const vector<decode::DecodeChannel> get_channels() const;
+	void auto_assign_signals(const shared_ptr<Decoder> dec);
+	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;
 
 	/**
@@ -139,67 +156,65 @@ public:
 	int64_t get_decoded_sample_count(uint32_t segment_id,
 		bool include_processing) const;
 
-	vector<decode::Row> get_rows(bool visible_only=false) const;
+	vector<Row*> get_rows(bool visible_only=false);
+	vector<const Row*> get_rows(bool visible_only=false) const;
 
-	uint64_t get_annotation_count(const decode::Row &row, uint32_t segment_id) const;
+	uint64_t get_annotation_count(const Row* row, uint32_t segment_id) const;
 
 	/**
 	 * Extracts annotations from a single row into a vector.
 	 * Note: The annotations may be unsorted and only annotations that fully
 	 * fit into the sample range are considered.
 	 */
-	void get_annotation_subset(
-		vector<pv::data::decode::Annotation> &dest,
-		const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
-		uint64_t end_sample) const;
+	void get_annotation_subset(deque<const Annotation*> &dest, const Row* row,
+		uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const;
 
 	/**
 	 * Extracts annotations from all rows into a vector.
 	 * Note: The annotations may be unsorted and only annotations that fully
 	 * fit into the sample range are considered.
 	 */
-	void get_annotation_subset(
-		vector<pv::data::decode::Annotation> &dest,
-		uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const;
+	void get_annotation_subset(deque<const Annotation*> &dest, uint32_t segment_id,
+		uint64_t start_sample, uint64_t end_sample) const;
 
 	uint32_t get_binary_data_chunk_count(uint32_t segment_id,
-		const data::decode::Decoder* dec, uint32_t bin_class_id) const;
-	void get_binary_data_chunk(uint32_t segment_id, const data::decode::Decoder* dec,
+		const Decoder* dec, uint32_t bin_class_id) const;
+	void get_binary_data_chunk(uint32_t segment_id, const Decoder* dec,
 		uint32_t bin_class_id, uint32_t chunk_id, const vector<uint8_t> **dest,
 		uint64_t *size);
 	void get_merged_binary_data_chunks_by_sample(uint32_t segment_id,
-		const data::decode::Decoder* dec, uint32_t bin_class_id,
+		const Decoder* dec, uint32_t bin_class_id,
 		uint64_t start_sample, uint64_t end_sample,
 		vector<uint8_t> *dest) const;
 	void get_merged_binary_data_chunks_by_offset(uint32_t segment_id,
-		const data::decode::Decoder* dec, uint32_t bin_class_id,
+		const Decoder* dec, uint32_t bin_class_id,
 		uint64_t start, uint64_t end,
 		vector<uint8_t> *dest) const;
 	const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id,
-		const data::decode::Decoder* dec, uint32_t bin_class_id) const;
+		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;
+	double get_input_samplerate(uint32_t segment_id) const;
 
-	uint32_t get_input_samplerate(uint32_t segment_id) const;
+	Decoder* get_decoder_by_instance(const srd_decoder *const srd_dec);
 
 	void update_channel_list();
 
 	void commit_decoder_channels();
 
 	void mux_logic_samples(uint32_t segment_id, const int64_t start, const int64_t end);
-
 	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();
@@ -207,11 +222,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*
@@ -221,16 +238,20 @@ 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_;
 
-	vector<data::decode::DecodeChannel> channels_;
+	vector<decode::DecodeChannel> channels_;
 
 	struct srd_session *srd_session_;
 
@@ -238,11 +259,10 @@ private:
 	uint32_t logic_mux_unit_size_;
 	bool logic_mux_data_invalid_;
 
-	vector< shared_ptr<decode::Decoder> > stack_;
+	vector< shared_ptr<Decoder> > stack_;
 	bool stack_config_changed_;
-	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
-	vector<DecodeSegment> segments_;
+	deque<DecodeSegment> segments_;
 	uint32_t current_segment_id_;
 
 	mutable mutex input_mutex_, output_mutex_, decode_pause_mutex_, logic_mux_mutex_;
@@ -254,7 +274,9 @@ private:
 
 	bool decode_paused_;
 
-	QString error_message_;
+	map<const srd_decoder*, shared_ptr<Logic>> output_logic_;
+	map<const srd_decoder*, vector<uint8_t>> output_logic_muxed_data_;
+	vector< shared_ptr<SignalBase>> output_signals_;
 };
 
 } // namespace data