X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecode%2Fannotation.cpp;h=3a0a51fda26adc24605d2f55eb3ade98a3fd2e56;hb=ced1cc130c182a605afa4832b32f92b76ca02d76;hp=797b428ae781354afe66b71a2860a89ef408a72e;hpb=88cd7da01957d3c3e17cf01a313aa37e356a2e66;p=pulseview.git

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 797b428..3a0a51f 100644
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -67,11 +67,10 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 	}
 }
 
-void Annotation::paint(QPainter &p, QColor text_color, int text_height,
+void Annotation::paint(QPainter &p, QColor text_color, int h,
 	int left, int right, double samples_per_pixel, double pixels_offset,
 	int y)
 {
-	const int h = (text_height * 3) / 2;
 	const double start = _start_sample / samples_per_pixel -
 		pixels_offset;
 	const double end = _end_sample / samples_per_pixel -
@@ -111,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())