X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=41f46dfcc75b414e47fbf8dd6bf47d2d7ff8502a;hp=3291c1615f4fb253048ae36468fc191a04c3840a;hb=26a883ede0bcf68d087eda5dd2082890d36c7aef;hpb=038a14278afb24e10cd59991c2cafd97264fd3a5

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 3291c16..41f46df 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -240,26 +240,25 @@ void AnalogSignal::paint_trace(QPainter &p,
 	int y, int left, const int64_t start, const int64_t end,
 	const double pixels_offset, const double samples_per_pixel)
 {
-	const int64_t sample_count = end - start;
-
-	const float *const samples = segment->get_samples(start, end);
-	assert(samples);
-
 	p.setPen(base_->colour());
 
-	QPointF *points = new QPointF[sample_count];
+	QPointF *points = new QPointF[end - start];
 	QPointF *point = points;
 
+	pv::data::SegmentAnalogDataIterator* it =
+		segment->begin_sample_iteration(start);
+
 	for (int64_t sample = start; sample != end; sample++) {
 		const float x = (sample / samples_per_pixel -
 			pixels_offset) + left;
-		*point++ = QPointF(x,
-			y - samples[sample - start] * scale_);
+
+		*point++ = QPointF(x, y - *((float*)it->value) * scale_);
+		segment->continue_sample_iteration(it, 1);
 	}
+	segment->end_sample_iteration(it);
 
 	p.drawPolyline(points, point - points);
 
-	delete[] samples;
 	delete[] points;
 }