X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=logicsignal.h;h=da9c3a42b749c2cf6473136623c1df9784b71e7c;hp=91c70ab21a9d644bb0814d3601a44a2b0c9c6d4b;hb=c0d9e65d17e2856c40bbc6172ef0a93011de9429;hpb=e3f65ace22c6bcd371967302f8d01d0769e3a23f

diff --git a/logicsignal.h b/logicsignal.h
index 91c70ab2..da9c3a42 100644
--- a/logicsignal.h
+++ b/logicsignal.h
@@ -26,12 +26,50 @@ class LogicData;
 
 class LogicSignal : public Signal
 {
+private:
+	static const float Margin;
+	static const float Oversampling;
+
+	static const QColor EdgeColour;
+	static const QColor HighColour;
+	static const QColor LowColour;
+
+	static const QColor LogicSignalColours[10];
+
 public:
-	LogicSignal(QString name, boost::shared_ptr<SignalData> data,
+	LogicSignal(QString name,
+		boost::shared_ptr<LogicData> data,
 		int probe_index);
 
-	void paint(QGLWidget &widget, const QRect &rect);
+	/**
+	 * 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(QPainter &p, const QRect &rect, double scale, double offset);
+
+private:
+
+	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);
+
+	/**
+	 * 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;
+	boost::shared_ptr<LogicData> _data;
 };