DecodeTrace: Prevent trace height from jumping

[pulseview.git] / pv / view / decodetrace.cpp

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 61f67b9eb584ca424786e59c753b0354fb4e1216..f2aadd1b18ff3c7e4b8904a53aeef1b8f7c8d0a9 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -133,6 +133,7 @@ DecodeTrace::DecodeTrace(pv::Session &session,
        session_(session),
        decoder_stack_(decoder_stack),
        row_height_(0),
+       max_visible_rows_(0),
        delete_mapper_(this),
        show_hide_mapper_(this)
 {
@@ -160,10 +161,9 @@ const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
 
 pair<int, int> DecodeTrace::v_extents() const
 {
-       /// @todo Replace this with an implementation that knows the true
-       /// height of the trace
        const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
-       return make_pair(-row_height / 2, row_height * 7 / 2);
+
+       return make_pair(-row_height, row_height * max_visible_rows_);
 }
 
 void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
@@ -211,9 +211,9 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
                decoder_stack_->get_annotation_subset(annotations, row,
                        sample_range.first, sample_range.second);
                if (!annotations.empty()) {
-                       for (const Annotation &a : annotations)
-                               draw_annotation(a, p, annotation_height,
-                                       pp, y, base_colour);
+                       draw_annotations(annotations, p, annotation_height, pp, y,
+                               base_colour);
+
                        y += row_height_;
 
                        visible_rows_.push_back(rows[i]);
@@ -222,6 +222,9 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 
        // Draw the hatching
        draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
+
+       // Update the maximum row count if needed
+       max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size());
 }
 
 void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
@@ -327,6 +330,48 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent)
        return menu;
 }
 
+void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> annotations,
+               QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+               size_t base_colour)
+{
+       using namespace pv::data::decode;
+
+       vector<Annotation> a_block;
+       int prev_ann_pos = INT_MIN;
+
+       double samples_per_pixel, pixels_offset;
+       tie(pixels_offset, samples_per_pixel) =
+               get_pixels_offset_samples_per_pixel();
+
+       // Gather all annotations that form a visual "block" and draw them as such
+       for (const Annotation &a : annotations) {
+
+               const int end = a.end_sample() / samples_per_pixel - pixels_offset;
+               const int delta = end - prev_ann_pos;
+
+               // Some annotations are in reverse order, so we cannot
+               // simply check for delta > 1
+               if (abs(delta) > 1) {
+                       // Block was broken, draw it
+                       if (a_block.size() == 1)
+                               draw_annotation(a_block.front(), p, h, pp, y, base_colour);
+                       else
+                               if (a_block.size() > 0)
+                                       draw_annotation_block(a_block, p, h, y, base_colour);
+
+                       a_block.clear();
+               }
+
+               a_block.push_back(a);
+               prev_ann_pos = end;
+       }
+
+       if (a_block.size() == 1)
+               draw_annotation(a_block.front(), p, h, pp, y, base_colour);
+       else
+               draw_annotation_block(a_block, p, h, y, base_colour);
+}
+
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
        QPainter &p, int h, const ViewItemPaintParams &pp, int y,
        size_t base_colour) const
@@ -353,6 +398,55 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
                draw_range(a, p, fill, outline, h, start, end, y);
 }
 
+void DecodeTrace::draw_annotation_block(
+       vector<pv::data::decode::Annotation> annotations, QPainter &p, int h,
+       int y, size_t base_colour) const
+{
+       using namespace pv::data::decode;
+
+       double samples_per_pixel, pixels_offset;
+       tie(pixels_offset, samples_per_pixel) =
+               get_pixels_offset_samples_per_pixel();
+
+       const double start = annotations.front().start_sample() /
+               samples_per_pixel - pixels_offset;
+       const double end = annotations.back().end_sample() /
+               samples_per_pixel - pixels_offset;
+
+       const double top = y + .5 - h / 2;
+       const double bottom = y + .5 + h / 2;
+       const double cap_width = min((end - start) / 4, EndCapWidth);
+
+       QPointF pts[] = {
+               QPointF(start, y + .5f),
+               QPointF(start + cap_width, top),
+               QPointF(end - cap_width, top),
+               QPointF(end, y + .5f),
+               QPointF(end - cap_width, bottom),
+               QPointF(start + cap_width, bottom)
+       };
+
+       const size_t colour = (base_colour + annotations.front().format()) %
+               countof(Colours);
+
+       // Check if all annotations are of the same type (i.e. we can use one color)
+       // or if we should use a neutral color (i.e. gray)
+       bool single_format = true;
+       int format = annotations.front().format();
+
+       for (const Annotation &a : annotations)
+               if (a.format() != format) {
+                       single_format = false;
+                       break;
+               }
+
+       p.setPen((single_format ? OutlineColours[colour] : Qt::gray));
+       p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
+               Qt::Dense4Pattern));
+
+       p.drawConvexPolygon(pts, countof(pts));
+}
+
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
        QColor fill, QColor outline, int h, double x, int y) const
 {