X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=ab9514cd4e4da34e706c522ecb4244a123a38ad9;hp=eb1f7f83d01324d1527e81ffdb890e17a2194dcd;hb=752281db3591fe0eeb2590379b2055b8e05cd14f;hpb=7352be721b90b630efd742b53e1a0ea16bb834b8 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index eb1f7f83..ab9514cd 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -44,6 +44,7 @@ extern "C" { #include "decodetrace.hpp" #include +#include #include #include #include @@ -86,6 +87,7 @@ const QColor DecodeTrace::NoDecodeColour = QColor(0x88, 0x8A, 0x85); const int DecodeTrace::ArrowSize = 4; const double DecodeTrace::EndCapWidth = 5; +const int DecodeTrace::RowTitleMargin = 10; const int DecodeTrace::DrawPadding = 100; const QColor DecodeTrace::Colours[16] = { @@ -139,6 +141,10 @@ DecodeTrace::DecodeTrace(pv::Session &session, { assert(decoder_stack_); + // Determine shortest string we want to see displayed in full + QFontMetrics m(QApplication::font()); + min_useful_label_width_ = m.width("XX"); // e.g. two hex characters + set_colour(DecodeColours[index % countof(DecodeColours)]); connect(decoder_stack_.get(), SIGNAL(new_decode_data()), @@ -198,9 +204,19 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) const vector rows(decoder_stack_->get_visible_rows()); visible_rows_.clear(); - for (size_t i = 0; i < rows.size(); i++) { - const Row &row = rows[i]; + for (const Row& row : rows) { + // Cache the row title widths + int row_title_width; + try { + row_title_width = row_title_widths_.at(row); + } catch (std::out_of_range) { + const int w = p.boundingRect(QRectF(), 0, row.title()).width() + + RowTitleMargin; + row_title_widths_[row] = w; + row_title_width = w; + } + // Determine the row's color size_t base_colour = 0x13579BDF; boost::hash_combine(base_colour, this); boost::hash_combine(base_colour, row.decoder()); @@ -212,11 +228,11 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) sample_range.first, sample_range.second); if (!annotations.empty()) { draw_annotations(annotations, p, annotation_height, pp, y, - base_colour); + base_colour, row_title_width); y += row_height_; - visible_rows_.push_back(rows[i]); + visible_rows_.push_back(row); } } @@ -332,7 +348,7 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) void DecodeTrace::draw_annotations(vector annotations, QPainter &p, int h, const ViewItemPaintParams &pp, int y, - size_t base_colour) + size_t base_colour, int row_title_width) { using namespace pv::data::decode; @@ -361,7 +377,7 @@ void DecodeTrace::draw_annotations(vector annotati bool a_is_separate = false; // Annotation wider than the threshold for a useful label width? - if (a_width > 20) { + if (a_width >= min_useful_label_width_) { 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 @@ -376,7 +392,8 @@ void DecodeTrace::draw_annotations(vector annotati 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); + draw_annotation(a_block.front(), p, h, pp, y, base_colour, + row_title_width); } else draw_annotation_block(a_block, p, h, y, base_colour); @@ -385,7 +402,7 @@ void DecodeTrace::draw_annotations(vector annotati } if (a_is_separate) { - draw_annotation(a, p, h, pp, y, base_colour); + draw_annotation(a, p, h, pp, y, base_colour, row_title_width); // 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 @@ -397,14 +414,15 @@ void DecodeTrace::draw_annotations(vector annotati } if (a_block.size() == 1) - draw_annotation(a_block.front(), p, h, pp, y, base_colour); + draw_annotation(a_block.front(), p, h, pp, y, base_colour, + row_title_width); 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 + size_t base_colour, int row_title_width) const { double samples_per_pixel, pixels_offset; tie(pixels_offset, samples_per_pixel) = @@ -416,16 +434,17 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, pixels_offset; const size_t colour = (base_colour + a.format()) % countof(Colours); - const QColor &fill = Colours[colour]; - const QColor &outline = OutlineColours[colour]; + p.setPen(OutlineColours[colour]); + p.setBrush(Colours[colour]); if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding) return; if (a.start_sample() == a.end_sample()) - draw_instant(a, p, fill, outline, h, start, y); + draw_instant(a, p, h, start, y); else - draw_range(a, p, fill, outline, h, start, end, y, pp); + draw_range(a, p, h, start, end, y, pp, + row_title_width); } void DecodeTrace::draw_annotation_block( @@ -467,7 +486,7 @@ void DecodeTrace::draw_annotation_block( } void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, int h, double x, int y) const + int h, double x, int y) const { const QString text = a.annotations().empty() ? QString() : a.annotations().back(); @@ -475,8 +494,6 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & 0.0) + h; const QRectF rect(x - w / 2, y - h / 2, w, h); - p.setPen(outline); - p.setBrush(fill); p.drawRoundedRect(rect, h / 2, h / 2); p.setPen(Qt::black); @@ -484,16 +501,13 @@ 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 ViewItemPaintParams &pp) const + int h, double start, double 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 vector annotations = a.annotations(); - p.setPen(outline); - p.setBrush(fill); - // If the two ends are within 1 pixel, draw a vertical line if (start + 1.0 > end) { p.drawLine(QPointF(start, top), QPointF(start, bottom)); @@ -519,9 +533,8 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, 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_start = std::max(ann_start, pp.left() + row_title_width); 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); @@ -783,8 +796,8 @@ void DecodeTrace::create_decoder_form(int index, connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_channel_selected(int))); decoder_form->addRow(tr("%1 (%2) *") - .arg(QString::fromUtf8(pdch->name)) - .arg(QString::fromUtf8(pdch->desc)), combo); + .arg(QString::fromUtf8(pdch->name), + QString::fromUtf8(pdch->desc)), combo); const ChannelSelector s = {combo, dec, pdch}; channel_selectors_.push_back(s); @@ -798,8 +811,8 @@ void DecodeTrace::create_decoder_form(int index, connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_channel_selected(int))); decoder_form->addRow(tr("%1 (%2)") - .arg(QString::fromUtf8(pdch->name)) - .arg(QString::fromUtf8(pdch->desc)), combo); + .arg(QString::fromUtf8(pdch->name), + QString::fromUtf8(pdch->desc)), combo); const ChannelSelector s = {combo, dec, pdch}; channel_selectors_.push_back(s); @@ -827,7 +840,8 @@ QComboBox* DecodeTrace::create_channel_selector( vector< shared_ptr > sig_list(sigs.begin(), sigs.end()); std::sort(sig_list.begin(), sig_list.end(), [](const shared_ptr &a, const shared_ptr b) { - return a->name().compare(b->name()) < 0; }); + return strnatcasecmp(a->name().toStdString(), + b->name().toStdString()) < 0; }); assert(decoder_stack_); const auto channel_iter = dec->channels().find(pdch);