From: Joel Holdsworth <redacted>
Date: Sun, 1 Dec 2013 11:40:11 +0000 (+0000)
Subject: Simplify drawing for zoomed out annotations
X-Git-Tag: pulseview-0.2.0~205
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=42410f2cd04d2f532557e2a765b660e474ca6b68;p=pulseview.git

Simplify drawing for zoomed out annotations
---

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index a2db331d..3a0a51fd 100644
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -110,19 +110,30 @@ void Annotation::draw_instant(QPainter &p, QColor fill, QColor outline,
 void Annotation::draw_range(QPainter &p, QColor fill, QColor outline,
 	QColor text_color, int h, double start, double end, int y)
 {
+	const double top = y + .5 - h / 2;
+	const double bottom = y + .5 + h / 2;
+
+	p.setPen(outline);
+	p.setBrush(fill);
+
+	// If the two ends are within 1 pixel, draw a vertical line
+	if (start + 1.0 > end)
+	{
+		p.drawLine(QPointF(start, top), QPointF(start, bottom));
+		return;
+	}
+
 	const double cap_width = min((end - start) / 2, EndCapWidth);
 
 	QPointF pts[] = {
 		QPointF(start, y + .5f),
-		QPointF(start + cap_width, y + .5f - h / 2),
-		QPointF(end - cap_width, y + .5f - h / 2),
+		QPointF(start + cap_width, top),
+		QPointF(end - cap_width, top),
 		QPointF(end, y + .5f),
-		QPointF(end - cap_width, y + .5f + h / 2),
-		QPointF(start + cap_width, y + .5f + h / 2)
+		QPointF(end - cap_width, bottom),
+		QPointF(start + cap_width, bottom)
 	};
 
-	p.setPen(outline);
-	p.setBrush(fill);
 	p.drawConvexPolygon(pts, countof(pts));
 
 	if (_annotations.empty())