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

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 6a3af14b..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;
 
@@ -140,25 +140,31 @@ public:
 	 */
 	QString internal_name() const;
 
+	/**
+	 * Produces a string for this signal that can be used for display,
+	 * i.e. it contains one or both of the signal/internal names.
+	 */
+	QString display_name() const;
+
 	/**
 	 * Sets the name of the signal.
 	 */
 	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.
@@ -181,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.
 	 */
@@ -274,6 +290,8 @@ private:
 	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 conversion_thread_proc();
@@ -285,13 +303,13 @@ 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);
 
 	void samples_cleared();
 
-	void samples_added(QObject* segment, uint64_t start_sample,
+	void samples_added(uint64_t segment_id, uint64_t start_sample,
 		uint64_t end_sample);
 
 	void min_max_changed(float min, float max);
@@ -325,7 +343,7 @@ protected:
 	QTimer delayed_conversion_starter_;
 
 	QString internal_name_, name_;
-	QColor colour_, bgcolour_;
+	QColor color_, bgcolor_;
 };
 
 } // namespace data