X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=a9c24b44da7bd13b27896ffc5cdc2e2173f54fad;hp=dd4a030ac1fa2de62cb5690b8a5db3490bf9426b;hb=785fd8d138e5866ade499c02ea405b8852fee113;hpb=8d634081d8b0cc741dd34d8c646474ff6754aea8

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index dd4a030a..a9c24b44 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -27,36 +27,40 @@
 
 namespace pv {
 
-class LogicData;
+namespace data {
+class Logic;
+}
 
 namespace view {
 
 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];
+	static const QColor SignalColours[10];
 
 public:
 	LogicSignal(QString name,
-		boost::shared_ptr<pv::LogicData> data,
+		boost::shared_ptr<pv::data::Logic> data,
 		int probe_index);
 
 	/**
 	 * Paints the signal with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param rect the rectangular area to draw the trace into.
+	 * @param y the y-coordinate to draw the signal at.
+	 * @param left the x-coordinate of the left edge of the signal.
+	 * @param right the x-coordinate of the right edge of the signal.
 	 * @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);
+	void paint(QPainter &p, int y, int left, int right, double scale,
+		double offset);
 
 private:
 
@@ -65,15 +69,9 @@ private:
 		bool level, double samples_per_pixel, double pixels_offset,
 		float x_offset, float y_offset);
 
-	/**
-	 * 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<pv::LogicData> _data;
+	boost::shared_ptr<pv::data::Logic> _data;
 };
 
 } // namespace view