X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=2223abaf75d3346532d26f81c9a529d0e4b3ae41;hb=1c552f400ee967f7a489853578c4d8d4bd2edfbf;hp=7d7a795e5f8648bf649fa46345d5a679a930c510;hpb=4b018bf1eeed0f7b80120d41d7881673a2f29e61;p=pulseview.git

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 7d7a795e..2223abaf 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -87,6 +87,7 @@ private:
 class SignalBase : public QObject, public enable_shared_from_this<SignalBase>
 {
 	Q_OBJECT
+	Q_PROPERTY(QString error_message READ get_error_message)
 
 public:
 	enum ChannelType {
@@ -112,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;
@@ -128,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.
 	 */
@@ -217,6 +226,11 @@ public:
 	 */
 	QColor bgcolor() const;
 
+	/**
+	 * Returns the current error message text.
+	 */
+	virtual QString get_error_message() const;
+
 	/**
 	 * Sets the internal data object.
 	 */
@@ -237,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.
@@ -338,32 +357,32 @@ public:
 
 	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(const 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);
 
@@ -375,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);
@@ -401,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