Draw insteantaneous annotations with a circle

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 4ad04f23caf34b155d0f938e18bc7d338de73e16..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[] = {

diff --git a/pv/view/decode/annotation.h b/pv/view/decode/annotation.h
index baa96657b9d863836b63a6ce95da28e63db28958..091cd26004acee80fea8eb45baf86cb5a181983e 100644 (file)
--- a/pv/view/decode/annotation.h
+++ b/pv/view/decode/annotation.h
@@ -35,6 +35,7 @@ class Annotation
 {
 private:
        static const double EndCapWidth;
+       static const int DrawPadding;
 
 public:
        Annotation(const srd_proto_data *const pdata);
@@ -43,6 +44,14 @@ public:
                QColor text_colour, int text_height, int left, int right,
                double samples_per_pixel, double pixels_offset, int y);
 
+private:
+       void draw_instant(QPainter &p, QColor fill, QColor outline,
+               QColor text_color, int h, double x, int y);
+
+       void draw_range(QPainter &p, QColor fill, QColor outline,
+               QColor text_color, int h, double start,
+               double end, int y);
+
 private:
        uint64_t _start_sample;
        uint64_t _end_sample;