X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=c4ae755152ca6b997843b07cb6e7f1fadb32cbcb;hb=f459c5400e067c4389c472b84194d760e7bfd585;hp=4241f80138705359e7df2b4cde134bcace28ee99;hpb=8d44d030c3923055f2ea81d5334d3a3bce7900c2;p=pulseview.git

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 4241f80..c4ae755 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -27,7 +27,9 @@
 
 namespace pv {
 
-class LogicData;
+namespace data {
+class Logic;
+}
 
 namespace view {
 
@@ -40,22 +42,27 @@ private:
 	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);
 
+	virtual ~LogicSignal();
+
 	/**
 	 * 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:
 
@@ -64,15 +71,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