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

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index b6f69ef5..7e119652 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -35,6 +35,8 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+#include "segment.hpp"
+
 using std::atomic;
 using std::condition_variable;
 using std::map;
@@ -55,6 +57,7 @@ class AnalogSegment;
 class DecoderStack;
 class Logic;
 class LogicSegment;
+class Segment;
 class SignalData;
 
 class SignalBase : public QObject
@@ -97,6 +100,7 @@ public:
 public:
 	/**
 	 * Returns the underlying SR channel.
+	 * Generated channels don't have a SR channel.
 	 */
 	shared_ptr<sigrok::Channel> channel() const;
 
@@ -122,6 +126,13 @@ public:
 	 */
 	unsigned int index() const;
 
+	/**
+	 * Sets the index number of this channel, i.e. a unique ID assigned by
+	 * the device driver or the logic bit index (see below).
+	 * Only use immediately after creating the signal and leave it untouched after.
+	 */
+	void set_index(unsigned int index);
+
 	/**
 	 * Returns which bit of a given sample for this signal represents the
 	 * signal itself. This is relevant for compound signals like logic,
@@ -136,10 +147,16 @@ public:
 	QString name() const;
 
 	/**
-	 * Gets the internal name of this signal, i.e. how the device calls it.
+	 * Gets the internal name of this signal, i.e. how the device/generator calls it.
 	 */
 	QString internal_name() const;
 
+	/**
+	 * Sets the internal name of this signal, i.e. how the device/generator calls it.
+	 * Only use immediately after creating the signal and leave it untouched after.
+	 */
+	void set_internal_name(QString internal_name);
+
 	/**
 	 * Produces a string for this signal that can be used for display,
 	 * i.e. it contains one or both of the signal/internal names.
@@ -171,6 +188,11 @@ public:
 	 */
 	void set_data(shared_ptr<pv::data::SignalData> data);
 
+	/**
+	 * Clears all sample data and removes all associated segments.
+	 */
+	void clear_sample_data();
+
 	/**
 	 * Get the internal data as analog data object in case of analog type.
 	 */
@@ -192,6 +214,11 @@ public:
 	 */
 	bool has_samples() const;
 
+	/**
+	 * Returns the sample rate for this signal.
+	 */
+	virtual double get_samplerate() const;
+
 	/**
 	 * Queries the kind of conversion performed on this channel.
 	 */
@@ -312,7 +339,7 @@ Q_SIGNALS:
 private Q_SLOTS:
 	void on_samples_cleared();
 
-	void on_samples_added(QObject* segment, uint64_t start_sample,
+	void on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
 		uint64_t end_sample);
 
 	void on_min_max_changed(float min, float max);
@@ -339,6 +366,7 @@ protected:
 
 	QString internal_name_, name_;
 	QColor color_, bgcolor_;
+	unsigned int index_;
 };
 
 } // namespace data