X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=19f8143dc77e3499a92ecb0d17fb07fe411605be;hp=7e1196521d0d3ae303a8b6258e6f62dce71cb798;hb=HEAD;hpb=999869aa676f7077b7181355eee28e9b025d4cea

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 7e119652..19f8143d 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -22,6 +22,7 @@
 #define PULSEVIEW_PV_DATA_SIGNALBASE_HPP
 
 #include <atomic>
+#include <deque>
 #include <condition_variable>
 #include <thread>
 #include <vector>
@@ -39,6 +40,8 @@
 
 using std::atomic;
 using std::condition_variable;
+using std::deque;
+using std::enable_shared_from_this;
 using std::map;
 using std::mutex;
 using std::pair;
@@ -58,12 +61,34 @@ class DecoderStack;
 class Logic;
 class LogicSegment;
 class Segment;
+class SignalBase;
 class SignalData;
 
-class SignalBase : public QObject
+class SignalGroup : public QObject
 {
 	Q_OBJECT
 
+public:
+	SignalGroup(const QString& name);
+
+	void append_signal(shared_ptr<SignalBase> signal);
+	void remove_signal(shared_ptr<SignalBase> signal);
+	deque<shared_ptr<SignalBase>> signals() const;
+	void clear();
+
+	const QString name() const;
+
+private:
+	deque<shared_ptr<SignalBase>> signals_;
+	QString name_;
+};
+
+
+class SignalBase : public QObject, public enable_shared_from_this<SignalBase>
+{
+	Q_OBJECT
+	Q_PROPERTY(QString error_message READ get_error_message NOTIFY error_message_changed)
+
 public:
 	enum ChannelType {
 		AnalogChannel = 1, ///< Analog data
@@ -88,6 +113,9 @@ public:
 		DynamicPreset = 0  ///< Conversion uses calculated values
 	};
 
+	static const QColor AnalogSignalColors[8];
+	static const QColor LogicSignalColors[10];
+
 private:
 	static const int ColorBGAlpha;
 	static const uint64_t ConversionBlockSize;
@@ -104,6 +132,11 @@ public:
 	 */
 	shared_ptr<sigrok::Channel> channel() const;
 
+	/**
+	 * Returns whether this channel is generated or a channel associated with the device.
+	 */
+	bool is_generated() const;
+
 	/**
 	 * Returns enabled status of this channel.
 	 */
@@ -141,6 +174,16 @@ public:
 	 */
 	unsigned int logic_bit_index() const;
 
+	/**
+	 * Sets the signal group this signal belongs to
+	 */
+	void set_group(SignalGroup* group);
+
+	/**
+	 * Returns the signal group this signal belongs to or nullptr if none
+	 */
+	SignalGroup* group() const;
+
 	/**
 	 * Gets the name of this signal.
 	 */
@@ -176,13 +219,18 @@ public:
 	/**
 	 * Set the color of the signal.
 	 */
-	void set_color(QColor color);
+	virtual void set_color(QColor color);
 
 	/**
 	 * Get the background color of the signal.
 	 */
 	QColor bgcolor() const;
 
+	/**
+	 * Returns the current error message text.
+	 */
+	virtual QString get_error_message() const;
+
 	/**
 	 * Sets the internal data object.
 	 */
@@ -203,6 +251,11 @@ public:
 	 */
 	shared_ptr<pv::data::Logic> logic_data() const;
 
+	/**
+	 * Get the primary internal data object, i.e. the data that was acquired from the device.
+	 */
+	shared_ptr<pv::data::SignalData> data() const;
+
 	/**
 	 * Determines whether a given segment is complete (i.e. end-of-frame has
 	 * been seen). It only considers the original data, not the converted data.
@@ -300,37 +353,36 @@ public:
 #endif
 
 	virtual void save_settings(QSettings &settings) const;
-
 	virtual void restore_settings(QSettings &settings);
 
 	void start_conversion(bool delayed_start=false);
 
+protected:
+	virtual void set_error_message(QString msg);
+
 private:
+	void stop_conversion();
+
 	bool conversion_is_a2l() const;
 
 	uint8_t convert_a2l_threshold(float threshold, float value);
 	uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
 		float value, uint8_t &state);
 
-	void convert_single_segment_range(AnalogSegment *asegment,
-		LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample);
-	void convert_single_segment(pv::data::AnalogSegment *asegment,
-		pv::data::LogicSegment *lsegment);
+	void convert_single_segment_range(shared_ptr<AnalogSegment> asegment,
+		shared_ptr<LogicSegment> lsegment, uint64_t start_sample, uint64_t end_sample);
+	void convert_single_segment(shared_ptr<AnalogSegment> asegment,
+		shared_ptr<LogicSegment> lsegment);
 	void conversion_thread_proc();
 
-	void stop_conversion();
-
 Q_SIGNALS:
 	void enabled_changed(const bool &value);
-
 	void name_changed(const QString &name);
-
 	void color_changed(const QColor &color);
-
+	void error_message_changed(QString msg);
 	void conversion_type_changed(const ConversionType t);
 
 	void samples_cleared();
-
 	void samples_added(uint64_t segment_id, uint64_t start_sample,
 		uint64_t end_sample);
 
@@ -342,6 +394,8 @@ private Q_SLOTS:
 	void on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
 		uint64_t end_sample);
 
+	void on_input_segment_completed();
+
 	void on_min_max_changed(float min, float max);
 
 	void on_capture_state_changed(int state);
@@ -351,6 +405,7 @@ private Q_SLOTS:
 protected:
 	shared_ptr<sigrok::Channel> channel_;
 	ChannelType channel_type_;
+	SignalGroup* group_;
 	shared_ptr<pv::data::SignalData> data_;
 	shared_ptr<pv::data::SignalData> converted_data_;
 	ConversionType conversion_type_;
@@ -367,9 +422,13 @@ protected:
 	QString internal_name_, name_;
 	QColor color_, bgcolor_;
 	unsigned int index_;
+
+	QString error_message_;
 };
 
 } // namespace data
 } // namespace pv
 
+Q_DECLARE_METATYPE(shared_ptr<pv::data::SignalBase>);
+
 #endif // PULSEVIEW_PV_DATA_SIGNALBASE_HPP