Store annotations as objects emplaced in the vector

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

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 339b46afb0b36fb11600fae64d87c6b7038461fb..4a110e67c4d4814af8ca49414b9cf9a9e21a50a5 100644 (file)
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -53,21 +53,36 @@ const QColor Annotation::Colours[7] = {
 
 Annotation::Annotation(const srd_proto_data *const pdata) :
        _start_sample(pdata->start_sample),
-       _end_sample(pdata->end_sample),
-       _format(pdata->ann_format)
+       _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 text_color, int text_height,
+uint64_t Annotation::start_sample() const
+{
+       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)
+       int y) const
 {
-       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 -
@@ -88,7 +103,7 @@ void Annotation::paint(QPainter &p, QColor text_color, int text_height,
 }
 
 void Annotation::draw_instant(QPainter &p, QColor fill, QColor outline,
-       QColor text_color, int h, double x, int y)
+       QColor text_color, int h, double x, int y) const
 {
        const QString text = _annotations.empty() ?
                QString() : _annotations.back();
@@ -105,21 +120,32 @@ void Annotation::draw_instant(QPainter &p, QColor fill, QColor outline,
 }
 
 void Annotation::draw_range(QPainter &p, QColor fill, QColor outline,
-       QColor text_color, int h, double start, double end, int y)
+       QColor text_color, int h, double start, double end, int y) const
 {
-       const double cap_width = min((end - start) / 2, EndCapWidth);
+       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())
@@ -133,7 +159,7 @@ void Annotation::draw_range(QPainter &p, QColor fill, QColor outline,
        QString best_annotation;
        int best_width = 0;
 
-       BOOST_FOREACH(QString &a, _annotations) {
+       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;