X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecode%2Fannotation.cpp;h=4a110e67c4d4814af8ca49414b9cf9a9e21a50a5;hp=0cf5bad0dd3f074d429102a644caea80fc8230bd;hb=db62bbfda512aeddca5b9d7b5960e9cf24b8859c;hpb=1ae79b11b6b409aae986e379f9280115395c8cf5

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 0cf5bad..4a110e6 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,57 +39,138 @@ 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);
+
+	_format = pda->ann_format;
+
+	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)
+uint64_t Annotation::start_sample() const
 {
-	const int h = (text_height * 3) / 2;
+	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) const
+{
 	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;
 
-	const double cap_width = min((end - start) / 2, EndCapWidth);
+	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
+{
+	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
+{
+	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) / 4, 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())
-	{
-		QRectF rect(start + cap_width, y - h / 2,
-			end - start - cap_width * 2, h);
-		p.setPen(text_color);
-		p.drawText(rect, Qt::AlignCenter,
-			p.fontMetrics().elidedText(
-				_annotations.front(), Qt::ElideRight,
-				rect.width()));
+	if (_annotations.empty())
+		return;
+
+	QRectF rect(start + cap_width, y - h / 2,
+		end - start - cap_width * 2, h);
+	p.setPen(text_color);
+
+	// Try to find an annotation that will fit
+	QString best_annotation;
+	int best_width = 0;
+
+	BOOST_FOREACH(const QString &a, _annotations) {
+		const int w = p.boundingRect(QRectF(), 0, a).width();
+		if (w <= rect.width() && w > best_width)
+			best_annotation = a, best_width = w;
 	}
+
+	if (best_annotation.isEmpty())
+		best_annotation = _annotations.back();
+
+	// If not ellide the last in the list
+	p.drawText(rect, Qt::AlignCenter, p.fontMetrics().elidedText(
+		best_annotation, Qt::ElideRight, rect.width()));
 }
 
 } // namespace decode