X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=e7ffbbb6acd361e9f44749cad1ea80d413049c5c;hp=61f67b9eb584ca424786e59c753b0354fb4e1216;hb=bdc2a99bcaa5aba7c6de2543bab6534299b8a5ee;hpb=f3697d314410ef2ce0ab8f53b11f7a9912c7b0cd diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 61f67b9e..e7ffbbb6 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) { @@ -160,10 +161,9 @@ const std::shared_ptr& DecodeTrace::decoder() const pair 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,78 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) return menu; } +void DecodeTrace::draw_annotations(vector annotations, + QPainter &p, int h, const ViewItemPaintParams &pp, int y, + size_t base_colour) +{ + using namespace pv::data::decode; + + vector a_block; + 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 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; + } + } + } + + // 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 + draw_annotation_block(a_block, p, h, y, base_colour); + + a_block.clear(); + } + + 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, 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 +428,44 @@ 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 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 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 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, QColor fill, QColor outline, int h, double x, int y) const {