X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=a4474dac8e06a0026b40da41e53b15b3cc7e8bc9;hp=6aeef98a57aa14f474e7b7d0fdcacbae8158a07a;hb=f9abdc014adda6771828db4c8caa8f66e066b7a3;hpb=ef8311a4296a2dc85c82b063de61efa4eb7a8404

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 6aeef98a..a4474dac 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -25,6 +25,7 @@
 #include "analogsignal.h"
 #include "pv/data/analog.h"
 #include "pv/data/analogsnapshot.h"
+#include "pv/view/view.h"
 
 using namespace boost;
 using namespace std;
@@ -66,18 +67,28 @@ void AnalogSignal::set_scale(float scale)
 	_scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
-	double offset)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+	if (_probe->enabled)
+		paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
-	assert(scale > 0);
 	assert(_data);
 	assert(right >= left);
 
+	assert(_view);
+	const int y = _v_offset - _view->v_offset();
+
+	const double scale = _view->scale();
+	assert(scale > 0);
+
+	const double offset = _view->offset();
+
 	if (!_probe->enabled)
 		return;
 
-	paint_axis(p, y, left, right);
-
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
 	if (snapshots.empty())