Draw insteantaneous annotations with a circle

[pulseview.git] / pv / view / decode / annotation.cpp

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 0cf5bad0dd3f074d429102a644caea80fc8230bd..f2b2f37f475621d8f1e8224b7553a04094c5ec31 100644 (file)
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -38,6 +38,7 @@ namespace view {
 namespace decode {
 
 const double Annotation::EndCapWidth = 5;
+const int Annotation::DrawPadding = 100;
 
 Annotation::Annotation(const srd_proto_data *const pdata) :
        _start_sample(pdata->start_sample),
@@ -55,15 +56,42 @@ void Annotation::paint(QPainter &p, QColor fill, QColor outline,
        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;
 
-       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[] = {
@@ -79,16 +107,29 @@ void Annotation::paint(QPainter &p, QColor fill, QColor 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(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