X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecode%2Fannotation.cpp;h=a2db331d4f2d0c466f0a0772435b0261ca9b1324;hp=4ad04f23caf34b155d0f938e18bc7d338de73e16;hb=5dfeb70fc60f1c4752697d8ad6f80e1415213197;hpb=bb4c67698d836703257e9559d1a98cb3819c61a5

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 4ad04f23..a2db331d 100644
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -26,11 +26,12 @@ extern "C" {
 
 #include <algorithm>
 
+#include <boost/foreach.hpp>
+
 #include <QPainter>
 
 #include "annotation.h"
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -38,32 +39,77 @@ namespace view {
 namespace decode {
 
 const double Annotation::EndCapWidth = 5;
+const int Annotation::DrawPadding = 100;
+
+const QColor Annotation::Colours[7] = {
+	QColor(0xFC, 0xE9, 0x4F),	// Light Butter
+	QColor(0xFC, 0xAF, 0x3E),	// Light Orange
+	QColor(0xE9, 0xB9, 0x6E),	// Light Chocolate
+	QColor(0x8A, 0xE2, 0x34),	// Light Green
+	QColor(0x72, 0x9F, 0xCF),	// Light Blue
+	QColor(0xAD, 0x7F, 0xA8),	// Light Plum
+	QColor(0xEF, 0x29, 0x29)	// Light Red
+};
 
 Annotation::Annotation(const srd_proto_data *const pdata) :
 	_start_sample(pdata->start_sample),
 	_end_sample(pdata->end_sample)
 {
-	const char *const *annotations = (char**)pdata->data;
+	assert(pdata);
+	const srd_proto_data_annotation *const pda =
+		(const srd_proto_data_annotation*)pdata->data;
+	assert(pda);
+
+	const char *const *annotations = (char**)pda->ann_text;
 	while(*annotations) {
 		_annotations.push_back(QString(*annotations));
 		annotations++;
 	}
 }
 
-void Annotation::paint(QPainter &p, QColor fill, QColor outline,
-	QColor text_color, int text_height, int left, int right,
-	double samples_per_pixel, double pixels_offset, int y)
+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 -
 		pixels_offset;
+	const QColor fill = Colours[(_format * (countof(Colours) / 2 + 1)) %
+		countof(Colours)];
+	const QColor outline(fill.darker());
 
-	if (start > right || end < left)
+	if (start > right + DrawPadding || end < left - DrawPadding)
 		return;
 
+	if (_start_sample == _end_sample)
+		draw_instant(p, fill, outline, text_color, h,
+			start, y);
+	else
+		draw_range(p, fill, outline, text_color, h,
+			start, end, y);
+}
+
+void Annotation::draw_instant(QPainter &p, QColor fill, QColor outline,
+	QColor text_color, int h, double x, int y)
+{
+	const QString text = _annotations.empty() ?
+		QString() : _annotations.back();
+	const double w = min(p.boundingRect(QRectF(), 0, text).width(),
+		0.0) + h;
+	const QRectF rect(x - w / 2, y - h / 2, w, h);
+
+	p.setPen(outline);
+	p.setBrush(fill);
+	p.drawRoundedRect(rect, h / 2, h / 2);
+
+	p.setPen(text_color);
+	p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text);
+}
+
+void Annotation::draw_range(QPainter &p, QColor fill, QColor outline,
+	QColor text_color, int h, double start, double end, int y)
+{
 	const double cap_width = min((end - start) / 2, EndCapWidth);
 
 	QPointF pts[] = {