DecodeTrace: Use qreal instead of int for annotation drawing

This is to prevent "blinking" of annotations when they would merge into
blocks and break off of them again, noticeable when zooming in and out
using a track pad or touchscreen.

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index a1db8edec12e3dfe2998c835797eb3d755e2a9cb..c2f3cebe5b7b40c14b23ca8e922a2faebdcb1a0c 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -22,11 +22,10 @@ extern "C" {
 }
 
 #include <mutex>
+#include <tuple>
 
 #include <extdef.h>
 
-#include <tuple>
-
 #include <boost/functional/hash.hpp>
 
 #include <QAction>
@@ -53,6 +52,7 @@ extern "C" {
 #include <pv/widgets/decodergroupbox.hpp>
 #include <pv/widgets/decodermenu.hpp>
 
+using std::abs;
 using std::all_of;
 using std::make_pair;
 using std::max;
@@ -329,13 +329,13 @@ void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> annotati
 
        Annotation::Class block_class = 0;
        bool block_class_uniform = true;
-       int block_start = 0;
+       qreal block_start = 0;
        int block_ann_count = 0;
 
        const Annotation *prev_ann;
-       int prev_end = INT_MIN;
+       qreal prev_end = INT_MIN;
 
-       int a_end;
+       qreal a_end;
 
        double samples_per_pixel, pixels_offset;
        tie(pixels_offset, samples_per_pixel) =
@@ -350,21 +350,21 @@ void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> annotati
        // Gather all annotations that form a visual "block" and draw them as such
        for (const Annotation &a : annotations) {
 
-               const int abs_a_start = a.start_sample() / samples_per_pixel;
-               const int abs_a_end   = a.end_sample() / samples_per_pixel;
+               const qreal abs_a_start = a.start_sample() / samples_per_pixel;
+               const qreal abs_a_end   = a.end_sample() / samples_per_pixel;
 
-               const int a_start = abs_a_start - pixels_offset;
+               const qreal a_start = abs_a_start - pixels_offset;
                a_end = abs_a_end - pixels_offset;
 
-               const int a_width = a_end - a_start;
-               const int delta = a_end - prev_end;
+               const qreal a_width = a_end - a_start;
+               const qreal delta = a_end - prev_end;
 
                bool a_is_separate = false;
 
                // Annotation wider than the threshold for a useful label width?
                if (a_width >= min_useful_label_width_) {
                        for (const QString &ann_text : a.annotations()) {
-                               const int w = p.boundingRect(QRectF(), 0, ann_text).width();
+                               const qreal w = p.boundingRect(QRectF(), 0, ann_text).width();
                                // Annotation wide enough to fit a label? Don't put it in a block then
                                if (w <= a_width) {
                                        a_is_separate = true;
@@ -392,6 +392,7 @@ void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> annotati
                        // because we set prev_end to INT_MIN but that's okay since
                        // block_ann_count will be 0 and nothing will be drawn
                        prev_end = INT_MIN;
+                       block_ann_count = 0;
                } else {
                        prev_end = a_end;
                        prev_ann = &a;
@@ -440,7 +441,7 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
                draw_range(a, p, h, start, end, y, pp, row_title_width);
 }
 
-void DecodeTrace::draw_annotation_block(int start, int end,
+void DecodeTrace::draw_annotation_block(qreal start, qreal end,
        Annotation::Class ann_class, bool use_ann_format, QPainter &p, int h,
        int y, QColor row_color) const
 {
@@ -470,11 +471,11 @@ void DecodeTrace::draw_annotation_block(int start, int end,
 }
 
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-       int h, double x, int y) const
+       int h, qreal x, int y) const
 {
        const QString text = a.annotations().empty() ?
                QString() : a.annotations().back();
-       const double w = min((double)p.boundingRect(QRectF(), 0, text).width(),
+       const qreal w = min((qreal)p.boundingRect(QRectF(), 0, text).width(),
                0.0) + h;
        const QRectF rect(x - w / 2, y - h / 2, w, h);
 
@@ -485,11 +486,11 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
 }
 
 void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-       int h, double start, double end, int y, const ViewItemPaintParams &pp,
+       int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp,
        int row_title_width) const
 {
-       const double top = y + .5 - h / 2;
-       const double bottom = y + .5 + h / 2;
+       const qreal top = y + .5 - h / 2;
+       const qreal bottom = y + .5 + h / 2;
        const vector<QString> annotations = a.annotations();
 
        // If the two ends are within 1 pixel, draw a vertical line
@@ -498,7 +499,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
                return;
        }
 
-       const double cap_width = min((end - start) / 4, EndCapWidth);
+       const qreal cap_width = min((end - start) / 4, EndCapWidth);
 
        QPointF pts[] = {
                QPointF(start, y + .5f),
@@ -557,7 +558,7 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message,
                QRectF(pp.left(), INT_MIN / 2 + y, pp.right(), INT_MAX);
        const QRectF text_rect = p.boundingRect(bounding_rect,
                Qt::AlignCenter, message);
-       const float r = text_rect.height() / 4;
+       const qreal r = text_rect.height() / 4;
 
        p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
                Qt::AbsoluteSize);

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 688a348f1092a0ea8d604459565008f9fb67d355..55c3f3b5c47a80edbdff1e4dfab92e723cfda3a8 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -131,15 +131,15 @@ private:
                int h, const ViewItemPaintParams &pp, int y,
                QColor row_color, int row_title_width) const;
 
-       void draw_annotation_block(int start, int end,
+       void draw_annotation_block(qreal start, qreal end,
                pv::data::decode::Annotation::Class ann_class, bool use_ann_format,
                QPainter &p, int h, int y, QColor row_color) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-               int h, double x, int y) const;
+               int h, qreal x, int y) const;
 
        void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-               int h, double start, double end, int y, const ViewItemPaintParams &pp,
+               int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp,
                int row_title_width) const;
 
        void draw_error(QPainter &p, const QString &message,