X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=4889d16acd4bc1ba75878cfe132e2d07b1202193;hb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b;hp=6667dd76847cab8ce3235c99d6ec19deb73544fb;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 6667dd7..4889d16 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -28,10 +28,10 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::shared_ptr;
 
 namespace sigrok {
 class Channel;
-class ChannelType;
 }
 
 namespace pv {
@@ -46,18 +46,27 @@ class SignalBase : public QObject
 {
 	Q_OBJECT
 
+public:
+	enum ChannelType {
+		AnalogChannel = 1,
+		LogicChannel,
+		DecodeChannel,
+		A2LChannel,  // Analog converted to logic, joint representation
+		MathChannel
+	};
+
 private:
 	static const int ColourBGAlpha;
 
 public:
-	SignalBase(std::shared_ptr<sigrok::Channel> channel);
+	SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type);
 	virtual ~SignalBase() {}
 
 public:
 	/**
 	 * Returns the underlying SR channel.
 	 */
-	std::shared_ptr<sigrok::Channel> channel() const;
+	shared_ptr<sigrok::Channel> channel() const;
 
 	/**
 	 * Returns enabled status of this channel.
@@ -73,7 +82,7 @@ public:
 	/**
 	 * Gets the type of this channel.
 	 */
-	const sigrok::ChannelType *type() const;
+	ChannelType type() const;
 
 	/**
 	 * Gets the index number of this channel.
@@ -113,25 +122,24 @@ public:
 	/**
 	 * Sets the internal data object.
 	 */
-	void set_data(std::shared_ptr<pv::data::SignalData> data);
+	void set_data(shared_ptr<pv::data::SignalData> data);
 
 	/**
 	 * Get the internal data as analog data object in case of analog type.
 	 */
-	std::shared_ptr<pv::data::Analog> analog_data() const;
+	shared_ptr<pv::data::Analog> analog_data() const;
 
 	/**
 	 * Get the internal data as logic data object in case of logic type.
 	 */
-	std::shared_ptr<pv::data::Logic> logic_data() const;
+	shared_ptr<pv::data::Logic> logic_data() const;
 
 #ifdef ENABLE_DECODE
 	bool is_decode_signal() const;
 
-	std::shared_ptr<pv::data::DecoderStack> decoder_stack() const;
+	shared_ptr<pv::data::DecoderStack> decoder_stack() const;
 
-	void set_decoder_stack(std::shared_ptr<pv::data::DecoderStack>
-		decoder_stack);
+	void set_decoder_stack(shared_ptr<pv::data::DecoderStack> decoder_stack);
 #endif
 
 	void save_settings(QSettings &settings) const;
@@ -146,11 +154,12 @@ Q_SIGNALS:
 	void colour_changed(const QColor &colour);
 
 private:
-	std::shared_ptr<sigrok::Channel> channel_;
-	std::shared_ptr<pv::data::SignalData> data_;
+	shared_ptr<sigrok::Channel> channel_;
+	ChannelType channel_type_;
+	shared_ptr<pv::data::SignalData> data_;
 
 #ifdef ENABLE_DECODE
-	std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+	shared_ptr<pv::data::DecoderStack> decoder_stack_;
 #endif
 
 	QString internal_name_, name_;