X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecode%2Fannotation.cpp;h=30efb5179dbaea65ee06d8a5bc2de5dadff8d4fe;hb=9a2bc5fcb8ad1e9c7885429609656316f9ad006b;hp=a2db331d4f2d0c466f0a0772435b0261ca9b1324;hpb=5dfeb70fc60f1c4752697d8ad6f80e1415213197;p=pulseview.git

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index a2db331..30efb51 100644
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -60,6 +60,8 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 		(const srd_proto_data_annotation*)pdata->data;
 	assert(pda);
 
+	_format = pda->ann_format;
+
 	const char *const *annotations = (char**)pda->ann_text;
 	while(*annotations) {
 		_annotations.push_back(QString(*annotations));
@@ -67,6 +69,16 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 	}
 }
 
+uint64_t Annotation::start_sample() const
+{
+	return _start_sample;
+}
+
+uint64_t Annotation::end_sample() const
+{
+	return _end_sample;
+}
+
 void Annotation::paint(QPainter &p, QColor text_color, int h,
 	int left, int right, double samples_per_pixel, double pixels_offset,
 	int y)
@@ -110,19 +122,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())