X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=c3e0d3d64ef56d02b289451c7cb3d54ca89c44f9;hp=efe4a54abe484bbd571a1209aacdad6d729beaff;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=784f6c75bf8d878b395b8eb7b5e92fa24d9b32ba

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index efe4a54a..c3e0d3d6 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -86,7 +86,7 @@ public:
 	};
 
 private:
-	static const int ColourBGAlpha;
+	static const int ColorBGAlpha;
 	static const uint64_t ConversionBlockSize;
 	static const uint32_t ConversionDelay;
 
@@ -152,19 +152,19 @@ public:
 	virtual void set_name(QString name);
 
 	/**
-	 * Get the colour of the signal.
+	 * Get the color of the signal.
 	 */
-	QColor colour() const;
+	QColor color() const;
 
 	/**
-	 * Set the colour of the signal.
+	 * Set the color of the signal.
 	 */
-	void set_colour(QColor colour);
+	void set_color(QColor color);
 
 	/**
-	 * Get the background colour of the signal.
+	 * Get the background color of the signal.
 	 */
-	QColor bgcolour() const;
+	QColor bgcolor() const;
 
 	/**
 	 * Sets the internal data object.
@@ -187,6 +187,16 @@ public:
 	 */
 	bool segment_is_complete(uint32_t segment_id) const;
 
+	/**
+	 * Determines whether this signal has any sample data at all.
+	 */
+	bool has_samples() const;
+
+	/**
+	 * Returns the sample rate for this signal.
+	 */
+	double get_samplerate() const;
+
 	/**
 	 * Queries the kind of conversion performed on this channel.
 	 */
@@ -293,7 +303,7 @@ Q_SIGNALS:
 
 	void name_changed(const QString &name);
 
-	void colour_changed(const QColor &colour);
+	void color_changed(const QColor &color);
 
 	void conversion_type_changed(const ConversionType t);
 
@@ -333,7 +343,7 @@ protected:
 	QTimer delayed_conversion_starter_;
 
 	QString internal_name_, name_;
-	QColor colour_, bgcolour_;
+	QColor color_, bgcolor_;
 };
 
 } // namespace data