X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=e559a4a45c50da008bc8ab234c5f693e417c6f20;hb=ff008de665c7990d5f3408f918ff090d8e6c60b2;hp=325ab6bd301e00e610f51e9997367b0a9cb9cd58;hpb=97904bf71258d3b522b00eb3dcae1efea6bd1298;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 325ab6b..e559a4a 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -100,31 +100,23 @@ 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;
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
-		data_->get_snapshots();
+		data_->analog_snapshots();
 	if (snapshots.empty())
 		return;
 
 	const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
 		snapshots.front();
 
-	const double pixels_offset = offset / scale;
-	const double samplerate = data_->samplerate();
-	const double start_time = data_->get_start_time();
+	const double pixels_offset = pp.pixels_offset();
+	const double samplerate = snapshot->samplerate();
+	const double start_time = snapshot->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),