X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=logicsignal.h;h=81fe6a4b1c9a4b89716ab24a91879243e38de006;hb=b3f22de060b73f15ad3eb2dabee04a0b4f5d947e;hp=60250b1e4bcac7669d00d0c9dbeb55bc56f5bbe0;hpb=131e801229c3cc899dd8a478d4491e384e57238e;p=pulseview.git

diff --git a/logicsignal.h b/logicsignal.h
index 60250b1..81fe6a4 100644
--- a/logicsignal.h
+++ b/logicsignal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -26,18 +26,15 @@ class LogicData;
 
 class LogicSignal : public Signal
 {
-private:
-	struct Point2F
-	{
-		GLfloat x, y;
-	};
-
 private:
 	static const float Margin;
+	static const float Oversampling;
 
-	static const float EdgeColour[3];
-	static const float HighColour[3];
-	static const float LowColour[3];
+	static const QColor EdgeColour;
+	static const QColor HighColour;
+	static const QColor LowColour;
+
+	static const QColor LogicSignalColours[10];
 
 public:
 	LogicSignal(QString name,
@@ -45,24 +42,32 @@ public:
 		int probe_index);
 
 	/**
-	 * 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 seconds per pixel.
 	 * @param offset the time to show at the left hand edge of
 	 *   the view in seconds.
 	 **/
-	void paint(QGLWidget &widget, const QRect &rect, double scale,
-		double offset);
+	void paint(QPainter &p, const QRect &rect, double scale, double offset);
 
 private:
 
-	int paint_caps(Point2F *const cap_points,
+	int paint_caps(QPainter &p, QLineF *const lines,
 		std::vector< std::pair<int64_t, bool> > &edges,
 		bool level, double samples_per_pixel, double pixels_offset,
 		int x_offset, int y_offset);
 
-	static void paint_lines(Point2F *points, int count);
+	/**
+	 * Get the colour of the logic signal
+	 */
+	QColor get_colour() const;
+
+	/**
+	 * When painting into the rectangle, calculate the y
+	 * offset of the zero point.
+	 **/
+	int get_nominal_offset(const QRect &rect) const;
 
 private:
 	int _probe_index;