X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=signal.h;h=7d59bb44021d7efe44074425eeb1a534bf453152;hp=2cec1299e0cce040cf78d90a0441933c4512e9ce;hb=64b60583ff73db2bd9458817276687b030fe48e1;hpb=3b18c57d8f224791481e0b768065bd4d11a3d79e

diff --git a/signal.h b/signal.h
index 2cec1299..7d59bb44 100644
--- a/signal.h
+++ b/signal.h
@@ -20,7 +20,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <QGLWidget>
+#include <QPainter>
 #include <QRect>
 #include <QString>
 
@@ -30,24 +30,46 @@ class SignalData;
 
 class Signal
 {
+private:
+	static const QSizeF LabelPadding;
+
 protected:
-	Signal(QString name, boost::shared_ptr<SignalData> data);
+	Signal(QString name);
 
 public:
 	QString get_name() const;
 
 	/**
-	 * Paints the signal into a QGLWidget.
-	 * @param widget the QGLWidget to paint into.
+	 * Paints the signal with a QPainter
+	 * @param p the QPainter to paint into.
 	 * @param rect the rectangular area to draw the trace into.
-	 * @param scale the scale in femtoseconds per pixel.
+	 * @param scale the scale in seconds per pixel.
 	 * @param offset the time to show at the left hand edge of
-	 *   the view in femtoseconds.
+	 *   the view in seconds.
+	 **/
+	virtual void paint(QPainter &p, const QRect &rect, double scale,
+		double offset) = 0;
+
+	/**
+	 * Paints the signal label into a QGLWidget.
+	 * @param p the QPainter to paint into.
+	 * @param rect the rectangular area to draw the label into.
+	 */
+	virtual void paint_label(QPainter &p, const QRect &rect);
+
+protected:
+
+	/**
+	 * Get the colour of the logic signal
+	 */
+	virtual QColor get_colour() const = 0;
+
+	/**
+	 * When painting into the rectangle, calculate the y
+	 * offset of the zero point.
 	 **/
-	virtual void paint(QGLWidget &widget, const QRect &rect,
-		uint64_t scale, int64_t offset) = 0;
+	virtual int get_nominal_offset(const QRect &rect) const = 0;
 
 protected:
 	QString _name;
-	boost::shared_ptr<SignalData> _data;
 };