X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=a15861c88d0ecfd8e4649389762dea8312dae754;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hp=8f79f919eaad3f7e67618378cb6405af9b4f193c;hpb=b8c4a95bc26d2976ea80001846d1ab7eb15cd3d5;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 8f79f91..a15861c 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -40,9 +40,9 @@
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/data/signalbase.hpp"
-#include "pv/view/view.hpp"
-#include "pv/view/logicsignal.hpp"
 #include "pv/globalsettings.hpp"
+#include "pv/view/logicsignal.hpp"
+#include "pv/view/view.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -68,12 +68,13 @@ const QColor AnalogSignal::SignalColours[4] = {
 	QColor(0x4E, 0x9A, 0x06)	// Green
 };
 
-const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
-const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
+const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40 * 256 / 100);
+const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20 * 256 / 100);
 
 const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77);
 
-const float AnalogSignal::EnvelopeThreshold = 256.0f;
+const int64_t AnalogSignal::TracePaintBlockSize = 1024 * 1024;  // 4 MiB (due to float)
+const float AnalogSignal::EnvelopeThreshold = 64.0f;
 
 const int AnalogSignal::MaximumVDivs = 10;
 const int AnalogSignal::MinScaleIndex = -6;
@@ -157,16 +158,14 @@ int AnalogSignal::scale_handle_offset() const
 {
 	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
 
-	return ((scale_index_drag_offset_ - scale_index_) *
-		h / 4) - h / 2;
+	return ((scale_index_drag_offset_ - scale_index_) * h / 4) - h / 2;
 }
 
 void AnalogSignal::scale_handle_dragged(int offset)
 {
 	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
 
-	scale_index_ = scale_index_drag_offset_ -
-		(offset + h / 2) / (h / 4);
+	scale_index_ = scale_index_drag_offset_ - (offset + h / 2) / (h / 4);
 
 	update_scale();
 }
@@ -311,6 +310,15 @@ 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)
 {
+	if (end <= start)
+		return;
+
+	// Calculate and paint the sampling points if enabled and useful
+	GlobalSettings settings;
+	const bool show_sampling_points =
+		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() &&
+		(samples_per_pixel < 0.25);
+
 	p.setPen(base_->colour());
 
 	const int64_t points_count = end - start;
@@ -318,38 +326,45 @@ void AnalogSignal::paint_trace(QPainter &p,
 	QPointF *points = new QPointF[points_count];
 	QPointF *point = points;
 
-	QRectF *const sampling_points = new QRectF[points_count];
+	QRectF *sampling_points = nullptr;
+	if (show_sampling_points)
+		 sampling_points = new QRectF[points_count];
 	QRectF *sampling_point = sampling_points;
 
-	pv::data::SegmentAnalogDataIterator* it =
-		segment->begin_sample_iteration(start);
+	int64_t sample_count = min(points_count, TracePaintBlockSize);
+	int64_t block_sample = 0;
+	const float *sample_block = segment->get_samples(start, start + sample_count);
 
 	const int w = 2;
-	for (int64_t sample = start; sample != end; sample++) {
+	for (int64_t sample = start; sample != end; sample++, block_sample++) {
+
+		if (block_sample == TracePaintBlockSize) {
+			block_sample = 0;
+			delete[] sample_block;
+			sample_count = min(points_count - sample, TracePaintBlockSize);
+			sample_block = segment->get_samples(sample, sample + sample_count);
+		}
+
 		const float x = (sample / samples_per_pixel -
 			pixels_offset) + left;
 
-		*point++ = QPointF(x, y - *((float*)it->value) * scale_);
-		*sampling_point++ = QRectF(x - (w / 2), y - *((float*)it->value) * scale_ - (w / 2), w, w);
+		*point++ = QPointF(x, y - sample_block[block_sample] * scale_);
 
-		segment->continue_sample_iteration(it, 1);
+		if (show_sampling_points)
+			*sampling_point++ =
+				QRectF(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w);
 	}
-	segment->end_sample_iteration(it);
+	delete[] sample_block;
 
 	p.drawPolyline(points, points_count);
 
-	// Paint the sampling points if enabled
-	GlobalSettings settings;
-	const bool show_sampling_points =
-		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
-
-	if (show_sampling_points && (samples_per_pixel < 0.25)) {
+	if (show_sampling_points) {
 		p.setPen(SamplingPointColour);
 		p.drawRects(sampling_points, points_count);
+		delete[] sampling_points;
 	}
 
 	delete[] points;
-	delete[] sampling_points;
 }
 
 void AnalogSignal::paint_envelope(QPainter &p,
@@ -371,7 +386,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
 	QRectF *const rects = new QRectF[e.length];
 	QRectF *rect = rects;
 
-	for (uint64_t sample = 0; sample < e.length-1; sample++) {
+	for (uint64_t sample = 0; sample < e.length - 1; sample++) {
 		const float x = ((e.scale * sample + e.start) /
 			samples_per_pixel - pixels_offset) + left;
 		const AnalogSegment::EnvelopeSample *const s =
@@ -379,8 +394,8 @@ void AnalogSignal::paint_envelope(QPainter &p,
 
 		// We overlap this sample with the next so that vertical
 		// gaps do not appear during steep rising or falling edges
-		const float b = y - max(s->max, (s+1)->min) * scale_;
-		const float t = y - min(s->min, (s+1)->max) * scale_;
+		const float b = y - max(s->max, (s + 1)->min) * scale_;
+		const float t = y - min(s->min, (s + 1)->max) * scale_;
 
 		float h = b - t;
 		if (h >= 0.0f && h <= 1.0f)