From: Uwe Hermann <redacted>
Date: Fri, 17 Mar 2017 19:35:20 +0000 (+0100)
Subject: Show sampling points in logic traces.
X-Git-Tag: pulseview-0.4.0~148
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e9c8e87cf09ad9761bea1193b25d01a87f8e0dd6;p=pulseview.git

Show sampling points in logic traces.

This fixes (parts of) bug #485.
---

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index cb170fe0..d4fac8b5 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -66,6 +66,7 @@ const float LogicSignal::Oversampling = 2.0f;
 const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
 const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00);
 const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00);
+const QColor LogicSignal::SamplingPointColour(0x77, 0x77, 0x77);
 
 const QColor LogicSignal::SignalColours[10] = {
 	QColor(0x16, 0x19, 0x1A),	// Black
@@ -227,6 +228,22 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		pixels_offset, pp.left(), low_offset);
 
 	delete[] cap_lines;
+
+	// Paint the sampling points
+	const uint64_t sampling_points_count = end_sample - start_sample + 1;
+	QRectF *const sampling_points = new QRectF[sampling_points_count];
+	QRectF *sampling_point = sampling_points;
+
+	const int w = 1;
+	const float y_middle = high_offset - ((high_offset - low_offset) / 2);
+	for (uint64_t i = start_sample; i < end_sample + 1; ++i) {
+		const float x = (i / samples_per_pixel - pixels_offset) + pp.left();
+		*sampling_point++ = QRectF(x - (w / 2), y_middle - (w / 2), w, w);
+	}
+
+	p.setPen(SamplingPointColour);
+	p.drawRects(sampling_points, sampling_points_count);
+	delete[] sampling_points;
 }
 
 void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index e000a3cd..cd4f0e23 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -56,6 +56,7 @@ private:
 	static const QColor EdgeColour;
 	static const QColor HighColour;
 	static const QColor LowColour;
+	static const QColor SamplingPointColour;
 
 	static const QColor SignalColours[10];