X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=5d838506cedb1877ccf3b284b92735ba2cf0025f;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hp=a7a69218bb4f12a25c97185068f8148cee959d01;hpb=3eb29afdb641606c2e2e059289d8cc103d027a25;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index a7a6921..5d83850 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -90,7 +90,7 @@ std::pair<int, int> AnalogSignal::v_extents() const
 void AnalogSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
 {
 	if (channel_->enabled())
-		paint_axis(p, get_visual_y(), pp.left(), pp.right());
+		paint_axis(p, pp, get_visual_y());
 }
 
 void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
@@ -100,14 +100,6 @@ void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 
 	const int y = get_visual_y();
 
-	const View *const view = owner_->view();
-	assert(view);
-
-	const double scale = view->scale();
-	assert(scale > 0);
-
-	const double offset = view->offset();
-
 	if (!channel_->enabled())
 		return;
 
@@ -119,12 +111,12 @@ void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 	const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
 		snapshots.front();
 
-	const double pixels_offset = offset / scale;
+	const double pixels_offset = pp.pixels_offset();
 	const double samplerate = data_->samplerate();
 	const double start_time = data_->get_start_time();
 	const int64_t last_sample = snapshot->get_sample_count() - 1;
-	const double samples_per_pixel = samplerate * scale;
-	const double start = samplerate * (offset - start_time);
+	const double samples_per_pixel = samplerate * pp.scale();
+	const double start = samplerate * (pp.offset() - start_time);
 	const double end = start + samples_per_pixel * pp.width();
 
 	const int64_t start_sample = min(max((int64_t)floor(start),