From ea47a30c748939c334dfdbb8215e52a53204f5e6 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 8 Sep 2013 01:08:40 +0100 Subject: [PATCH] Draw insteantaneous annotations with a circle --- pv/view/decode/annotation.cpp | 32 ++++++++++++++++++++++++++++++-- pv/view/decode/annotation.h | 9 +++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp index 4ad04f23..f2b2f37f 100644 --- 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 baa96657..091cd260 100644 --- 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; -- 2.30.2