X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=c64d86afdf1fbcfaa45c377f8b762d6b7314ffb6;hb=00f6bae935837b38b0d03a5928ba8175d460413f;hp=2715a386bdf83a37d64e194063b86b23e8c552d8;hpb=681b6d5a08c604e0dab71d35a27983e34359af7b;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 2715a38..c64d86a 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -38,6 +38,7 @@
 #include "pv/data/analogsegment.hpp"
 #include "pv/data/signalbase.hpp"
 #include "pv/view/view.hpp"
+#include "pv/globalsettings.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -61,6 +62,8 @@ const QColor AnalogSignal::SignalColours[4] = {
 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 int AnalogSignal::MaximumVDivs = 10;
@@ -80,7 +83,7 @@ AnalogSignal::AnalogSignal(
 	pos_vdivs_(1),
 	neg_vdivs_(1),
 	resolution_(0),
-	autoranging_(1)
+	autoranging_(true)
 {
 	pv::data::Analog* analog_data =
 		dynamic_cast<pv::data::Analog*>(data().get());
@@ -277,24 +280,43 @@ void AnalogSignal::paint_trace(QPainter &p,
 {
 	p.setPen(base_->colour());
 
-	QPointF *points = new QPointF[end - start];
+	const int64_t points_count = end - start;
+
+	QPointF *points = new QPointF[points_count];
 	QPointF *point = points;
 
+	QRectF *const sampling_points = new QRectF[points_count];
+	QRectF *sampling_point = sampling_points;
+
 	pv::data::SegmentAnalogDataIterator* it =
 		segment->begin_sample_iteration(start);
 
+	const int w = 2;
 	for (int64_t sample = start; sample != end; sample++) {
 		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);
+
 		segment->continue_sample_iteration(it, 1);
 	}
 	segment->end_sample_iteration(it);
 
-	p.drawPolyline(points, point - points);
+	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)) {
+		p.setPen(SamplingPointColour);
+		p.drawRects(sampling_points, points_count);
+	}
 
 	delete[] points;
+	delete[] sampling_points;
 }
 
 void AnalogSignal::paint_envelope(QPainter &p,