DecodeTrace: With a rounded rect

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

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index dd39b321b9d789208d1e341dec55260e67efd181..e0f3a0f262734509dadd3d412a920fb2dfe789fc 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),
        session_(session),
        decoder_stack_(decoder_stack),
        row_height_(0),

+       max_visible_rows_(0),

        delete_mapper_(this),
        show_hide_mapper_(this)
 {
        delete_mapper_(this),
        show_hide_mapper_(this)
 {


@@ -161,9 +162,8 @@ const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
 pair<int, int> DecodeTrace::v_extents() const
 {
        const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
 pair<int, int> DecodeTrace::v_extents() const
 {
        const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;

-       const int rows = visible_rows_.size();

 
 

-       return make_pair(-row_height, row_height * rows);
+       return make_pair(-row_height, row_height * max_visible_rows_);

 }
 
 void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 }
 
 void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)


@@ -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());
 
        // 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)
 }
 
 void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)


@@ -354,7 +357,7 @@ void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> annotati
                                draw_annotation(a_block.front(), p, h, pp, y, base_colour);
                        else
                                if (a_block.size() > 0)
                                draw_annotation(a_block.front(), p, h, pp, y, base_colour);
                        else
                                if (a_block.size() > 0)

-                                       draw_annotation_block(a_block, p, h, pp, y, base_colour);
+                                       draw_annotation_block(a_block, p, h, y, base_colour);

 
                        a_block.clear();
                }
 
                        a_block.clear();
                }


@@ -366,7 +369,7 @@ void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> annotati
        if (a_block.size() == 1)
                draw_annotation(a_block.front(), p, h, pp, y, base_colour);
        else
        if (a_block.size() == 1)
                draw_annotation(a_block.front(), p, h, pp, y, base_colour);
        else

-               draw_annotation_block(a_block, p, h, pp, y, base_colour);
+               draw_annotation_block(a_block, p, h, y, base_colour);

 }
 
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
 }
 
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,


@@ -395,31 +398,39 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
                draw_range(a, p, fill, outline, h, start, end, y);
 }
 
                draw_range(a, p, fill, outline, h, start, end, y);
 }
 

-void DecodeTrace::draw_annotation_block(vector<pv::data::decode::Annotation> a,
-       QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-       size_t base_colour) const
+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();
 
        double samples_per_pixel, pixels_offset;
        tie(pixels_offset, samples_per_pixel) =
                get_pixels_offset_samples_per_pixel();
 

-       const size_t colour =
-               (base_colour + a.front().format()) % countof(Colours);
+       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 int start = a.front().start_sample() / samples_per_pixel -
-               pixels_offset;
-       const int end = a.back().end_sample() / samples_per_pixel -
-               pixels_offset;
-
-       const QRectF rect(
-               std::max(pp.left(), start),
-               y - h/2 + 0.5,
-               std::min(pp.right(), end) - std::max(pp.left(), start) + 1,
-               h);
+       const double top = y + .5 - h / 2;
+       const double bottom = y + .5 + h / 2;

 
 

-       p.setPen(OutlineColours[colour]);
-       p.setBrush(Colours[colour]);
-       p.drawRect(rect);
+       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)
+       const int format = annotations.front().format();
+       const bool single_format = std::all_of(
+               annotations.begin(), annotations.end(),
+               [&](const Annotation &a) { return a.format() == format; });
+
+       p.setPen((single_format ? OutlineColours[colour] : Qt::gray));
+       p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
+               Qt::Dense4Pattern));
+       p.drawRoundedRect(
+               QRectF(start, top, end - start, bottom - top), h/4, h/4);

 }
 
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
 }
 
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,