X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=eb1f7f83d01324d1527e81ffdb890e17a2194dcd;hp=dd39b321b9d789208d1e341dec55260e67efd181;hb=7352be721b90b630efd742b53e1a0ea16bb834b8;hpb=796e136093befc76f6c223afff1c1221182cf5dd diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index dd39b321..eb1f7f83 100644 --- 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) { @@ -161,9 +162,8 @@ const std::shared_ptr& DecodeTrace::decoder() const pair 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) @@ -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) @@ -334,39 +337,69 @@ void DecodeTrace::draw_annotations(vector annotati using namespace pv::data::decode; vector a_block; - int prev_ann_pos = INT_MIN; + int p_end = INT_MIN; double samples_per_pixel, pixels_offset; tie(pixels_offset, samples_per_pixel) = get_pixels_offset_samples_per_pixel(); + // Sort the annotations by start sample so that decoders + // can't confuse us by creating annotations out of order + stable_sort(annotations.begin(), annotations.end(), + [](const Annotation &a, const Annotation &b) { + return a.start_sample() < b.start_sample(); }); + // 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; + const int a_start = a.start_sample() / samples_per_pixel - pixels_offset; + const int a_end = a.end_sample() / samples_per_pixel - pixels_offset; + const int a_width = a_end - a_start; + + const int delta = a_end - p_end; + + bool a_is_separate = false; + + // Annotation wider than the threshold for a useful label width? + if (a_width > 20) { + for (const QString &ann_text : a.annotations()) { + const int 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; + break; + } + } + } - // 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) + // Were the previous and this annotation more than a pixel apart? + if ((abs(delta) > 1) || a_is_separate) { + // Block was broken, draw annotations that form the current block + 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, pp, y, base_colour); + draw_annotation_block(a_block, p, h, y, base_colour); a_block.clear(); } - a_block.push_back(a); - prev_ann_pos = end; + if (a_is_separate) { + draw_annotation(a, p, h, pp, y, base_colour); + // Next annotation must start a new block. delta will be > 1 + // because we set p_end to INT_MIN but that's okay since + // a_block will be empty, so nothing will be drawn + p_end = INT_MIN; + } else { + a_block.push_back(a); + p_end = a_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, pp, y, base_colour); + draw_annotation_block(a_block, p, h, y, base_colour); } void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, @@ -392,34 +425,45 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, if (a.start_sample() == a.end_sample()) draw_instant(a, p, fill, outline, h, start, y); else - draw_range(a, p, fill, outline, h, start, end, y); + draw_range(a, p, fill, outline, h, start, end, y, pp); } -void DecodeTrace::draw_annotation_block(vector a, - QPainter &p, int h, const ViewItemPaintParams &pp, int y, - size_t base_colour) const +void DecodeTrace::draw_annotation_block( + vector annotations, QPainter &p, int h, + int y, size_t base_colour) const { + using namespace pv::data::decode; + + if (annotations.empty()) + return; + 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 double top = y + .5 - h / 2; + const double bottom = y + .5 + h / 2; + + const size_t colour = (base_colour + annotations.front().format()) % + countof(Colours); - 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); + // 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(OutlineColours[colour]); - p.setBrush(Colours[colour]); - p.drawRect(rect); + 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, @@ -441,7 +485,7 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, QColor fill, QColor outline, int h, double start, - double end, int y) const + double end, int y, const ViewItemPaintParams &pp) const { const double top = y + .5 - h / 2; const double bottom = y + .5 + h / 2; @@ -472,8 +516,15 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, if (annotations.empty()) return; - QRectF rect(start + cap_width, y - h / 2, - end - start - cap_width * 2, h); + const int ann_start = start + cap_width; + const int ann_end = end - cap_width; + + const int real_start = std::max(ann_start, pp.left()); + const int real_end = std::min(ann_end, pp.right()); + + const int real_width = real_end - real_start; + + QRectF rect(real_start, y - h / 2, real_width, h); if (rect.width() <= 4) return;