X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=f175bd49046617a0a35d5a65f6533d4226525eec;hp=0f625b1a3b4bd62ba37f6b309056d81fa9457773;hb=ae30ff422a495a6b1a4ad2893566628863ea222b;hpb=81dc02212c05c99554194a15f9b584e6b500cda9 diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index 0f625b1a..f175bd49 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -34,6 +34,7 @@ extern "C" { #include #include #include +#include #include #include #include @@ -57,6 +58,7 @@ extern "C" { #include #include #include +#include using std::abs; using std::find_if; @@ -65,7 +67,6 @@ using std::make_pair; using std::max; using std::min; using std::numeric_limits; -using std::out_of_range; using std::pair; using std::shared_ptr; using std::tie; @@ -81,13 +82,10 @@ namespace pv { namespace views { namespace trace { - -#define DECODETRACE_COLOR_SATURATION (180) /* 0-255 */ -#define DECODETRACE_COLOR_VALUE (170) /* 0-255 */ - const QColor DecodeTrace::ErrorBgColor = QColor(0xEF, 0x29, 0x29); const QColor DecodeTrace::NoDecodeColor = QColor(0x88, 0x8A, 0x85); const QColor DecodeTrace::ExpandMarkerWarnColor = QColor(0xFF, 0xA5, 0x00); // QColorConstants::Svg::orange +const QColor DecodeTrace::ExpandMarkerHiddenColor = QColor(0x69, 0x69, 0x69); // QColorConstants::Svg::dimgray const uint8_t DecodeTrace::ExpansionAreaHeaderAlpha = 10 * 255 / 100; const uint8_t DecodeTrace::ExpansionAreaAlpha = 5 * 255 / 100; @@ -97,13 +95,59 @@ const int DecodeTrace::RowTitleMargin = 7; const int DecodeTrace::DrawPadding = 100; const int DecodeTrace::MaxTraceUpdateRate = 1; // No more than 1 Hz -const unsigned int DecodeTrace::AnimationDurationInTicks = 7; +const int DecodeTrace::AnimationDurationInTicks = 7; +const int DecodeTrace::HiddenRowHideDelay = 1000; // 1 second + +/** + * Helper function for forceUpdate() + */ +void invalidateLayout(QLayout* layout) +{ + // Recompute the given layout and all its child layouts recursively + for (int i = 0; i < layout->count(); i++) { + QLayoutItem *item = layout->itemAt(i); + + if (item->layout()) + invalidateLayout(item->layout()); + else + item->invalidate(); + } + + layout->invalidate(); + layout->activate(); +} + +void forceUpdate(QWidget* widget) +{ + // Update all child widgets recursively + for (QObject* child : widget->children()) + if (child->isWidgetType()) + forceUpdate((QWidget*)child); + + // Invalidate the layout of the widget itself + if (widget->layout()) + invalidateLayout(widget->layout()); +} + + +ContainerWidget::ContainerWidget(QWidget *parent) : + QWidget(parent) +{ +} + +void ContainerWidget::resizeEvent(QResizeEvent* event) +{ + QWidget::resizeEvent(event); + + widgetResized(this); +} + DecodeTrace::DecodeTrace(pv::Session &session, shared_ptr signalbase, int index) : Trace(signalbase), session_(session), - max_visible_rows_(0), + show_hidden_rows_(false), delete_mapper_(this), show_hide_mapper_(this), row_show_hide_mapper_(this) @@ -128,11 +172,14 @@ DecodeTrace::DecodeTrace(pv::Session &session, // Note: The offset equals the color of the first annotation QColor color; const int h = (120 + 160 * index) % 360; - const int s = DECODETRACE_COLOR_SATURATION; - const int v = DECODETRACE_COLOR_VALUE; + const int s = DECODE_COLOR_SATURATION; + const int v = DECODE_COLOR_VALUE; color.setHsv(h, s, v); base_->set_color(color); + connect(decode_signal_.get(), SIGNAL(color_changed(QColor)), + this, SLOT(on_color_changed(QColor))); + connect(decode_signal_.get(), SIGNAL(new_annotations()), this, SLOT(on_new_annotations())); connect(decode_signal_.get(), SIGNAL(decode_reset()), @@ -160,6 +207,11 @@ DecodeTrace::DecodeTrace(pv::Session &session, this, SLOT(on_animation_timer())); animation_timer_.setInterval(1000 / 50); + connect(&delayed_hidden_row_hider_, SIGNAL(timeout()), + this, SLOT(on_hide_hidden_rows())); + delayed_hidden_row_hider_.setSingleShot(true); + delayed_hidden_row_hider_.setInterval(HiddenRowHideDelay); + default_marker_shape_ << QPoint(0, -ArrowSize); default_marker_shape_ << QPoint(ArrowSize, 0); default_marker_shape_ << QPoint(0, ArrowSize); @@ -189,10 +241,21 @@ shared_ptr DecodeTrace::base() const return base_; } +void DecodeTrace::set_owner(TraceTreeItemOwner *owner) +{ + Trace::set_owner(owner); + + // The owner is set in trace::View::signals_changed(), which is a slot. + // So after this trace was added to the view, we won't have an owner + // that we need to initialize in update_rows(). Once we do, we call it + // from on_decode_reset(). + on_decode_reset(); +} + pair DecodeTrace::v_extents() const { // Make an empty decode trace appear symmetrical - if (max_visible_rows_ == 0) + if (visible_rows_ == 0) return make_pair(-default_row_height_, default_row_height_); unsigned int height = 0; @@ -212,6 +275,11 @@ void DecodeTrace::paint_back(QPainter &p, ViewItemPaintParams &pp) void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) { lock_guard lock(row_modification_mutex_); + unsigned int visible_rows; + +#if DECODETRACE_SHOW_RENDER_TIME + render_time_.restart(); +#endif // Set default pen to allow for text width calculation p.setPen(Qt::black); @@ -224,42 +292,44 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) sample_range.second = min((int64_t)sample_range.second, decode_signal_->get_decoded_sample_count(current_segment_, false)); - visible_rows_ = 0; + visible_rows = 0; int y = get_visual_y(); for (DecodeTraceRow& r : rows_) { // If the row is hidden, we don't want to fetch annotations assert(r.decode_row); assert(r.decode_row->decoder()); - if ((!r.decode_row->decoder()->shown()) || (!r.decode_row->visible())) { + if ((!r.decode_row->decoder()->visible()) || + ((!r.decode_row->visible() && (!show_hidden_rows_) && (!r.expanding) && (!r.expanded) && (!r.collapsing)))) { r.currently_visible = false; continue; } - vector annotations; + deque annotations; decode_signal_->get_annotation_subset(annotations, r.decode_row, current_segment_, sample_range.first, sample_range.second); - // Show row if there are visible annotations or when user wants to see + // Show row if there are visible annotations, when user wants to see // all rows that have annotations somewhere and this one is one of them + // or when the row has at least one hidden annotation class r.currently_visible = !annotations.empty(); if (!r.currently_visible) { size_t ann_count = decode_signal_->get_annotation_count(r.decode_row, current_segment_); - r.currently_visible = always_show_all_rows_ && (ann_count > 0); + r.currently_visible = ((always_show_all_rows_ || r.has_hidden_classes) && + (ann_count > 0)) || r.expanded; } if (r.currently_visible) { - draw_annotations(annotations, p, annotation_height_, pp, y, - get_row_color(r.decode_row->index()), r.title_width); + draw_annotations(annotations, p, pp, y, r); y += r.height; - visible_rows_++; + visible_rows++; } } - draw_unresolved_period(p, annotation_height_, pp.left(), pp.right()); + draw_unresolved_period(p, pp.left(), pp.right()); - if (visible_rows_ > max_visible_rows_) { - max_visible_rows_ = visible_rows_; + if (visible_rows != visible_rows_) { + visible_rows_ = visible_rows; // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -269,12 +339,18 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) const QString err = decode_signal_->error_message(); if (!err.isEmpty()) draw_error(p, err, pp); + +#if DECODETRACE_SHOW_RENDER_TIME + qDebug() << "Rendering" << base_->name() << "took" << render_time_.elapsed() << "ms"; +#endif } void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp) { unsigned int y = get_visual_y(); + update_expanded_rows(); + for (const DecodeTraceRow& r : rows_) { if (!r.currently_visible) continue; @@ -283,6 +359,8 @@ void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp) if (r.expand_marker_highlighted) p.setBrush(QApplication::palette().brush(QPalette::Highlight)); + else if (!r.decode_row->visible()) + p.setBrush(ExpandMarkerHiddenColor); else if (r.has_hidden_classes) p.setBrush(ExpandMarkerWarnColor); else @@ -309,7 +387,11 @@ void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp) p.drawText(text_rect.translated(dx, dy), f, h); // Draw the text - p.setPen(QApplication::palette().color(QPalette::WindowText)); + if (!r.decode_row->visible()) + p.setPen(ExpandMarkerHiddenColor); + else + p.setPen(QApplication::palette().color(QPalette::WindowText)); + p.drawText(text_rect, f, h); y += r.height; @@ -321,7 +403,7 @@ void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp) void DecodeTrace::update_stack_button() { - const vector< shared_ptr > &stack = decode_signal_->decoder_stack(); + const vector< shared_ptr > &stack = decode_signal_->decoder_stack(); // Only show decoders in the menu that can be stacked onto the last one in the stack if (!stack.empty()) { @@ -348,8 +430,6 @@ void DecodeTrace::update_stack_button() void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) { - using pv::data::decode::Decoder; - assert(form); // Add the standard options @@ -533,9 +613,13 @@ void DecodeTrace::hover_point_changed(const QPoint &hp) if (hover_row) { int row_y = get_row_y(hover_row); - if ((hp.x() > 0) && (hp.x() < 2 * ArrowSize) && - (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) + if ((hp.x() > 0) && (hp.x() < (int)(ArrowSize + 3 + hover_row->title_width)) && + (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) { + hover_row->expand_marker_highlighted = true; + show_hidden_rows_ = true; + delayed_hidden_row_hider_.start(); + } } // Tooltip handling @@ -573,13 +657,16 @@ void DecodeTrace::hover_point_changed(const QPoint &hp) void DecodeTrace::mouse_left_press_event(const QMouseEvent* event) { + // Update container widths which depend on the scrollarea's current width + update_expanded_rows(); + // Handle row expansion marker for (DecodeTraceRow& r : rows_) { if (!r.expand_marker_highlighted) continue; unsigned int y = get_row_y(&r); - if ((event->x() > 0) && (event->x() <= (int)(ArrowSize + 3)) && + if ((event->x() > 0) && (event->x() <= (int)(ArrowSize + 3 + r.title_width)) && (event->y() > (int)(y - (default_row_height_ / 2))) && (event->y() <= (int)(y + (default_row_height_ / 2)))) { @@ -590,32 +677,32 @@ void DecodeTrace::mouse_left_press_event(const QMouseEvent* event) } else { r.expanding = true; r.anim_shape = 0; + + // Force geometry update of the widget container to get + // an up-to-date height (which also depends on the width) + forceUpdate(r.container); + r.container->setVisible(true); - QApplication::processEvents(); - r.expanded_height = 5 * default_row_height_ + r.container->size().height(); + r.expanded_height = 2 * default_row_height_ + r.container->sizeHint().height(); } r.animation_step = 0; r.anim_height = r.height; - update_expanded_rows(); animation_timer_.start(); } } } -void DecodeTrace::draw_annotations(vector annotations, - QPainter &p, int h, const ViewItemPaintParams &pp, int y, - QColor row_color, int row_title_width) +void DecodeTrace::draw_annotations(deque& annotations, + QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) { - using namespace pv::data::decode; - Annotation::Class block_class = 0; bool block_class_uniform = true; qreal block_start = 0; int block_ann_count = 0; - const Annotation *prev_ann; + const Annotation* prev_ann; qreal prev_end = INT_MIN; qreal a_end; @@ -624,17 +711,11 @@ void DecodeTrace::draw_annotations(vector annotati 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) { + for (const Annotation* a : annotations) { - const qreal abs_a_start = a.start_sample() / samples_per_pixel; - const qreal abs_a_end = a.end_sample() / samples_per_pixel; + const qreal abs_a_start = a->start_sample() / samples_per_pixel; + const qreal abs_a_end = a->end_sample() / samples_per_pixel; const qreal a_start = abs_a_start - pixels_offset; a_end = abs_a_end - pixels_offset; @@ -646,7 +727,7 @@ void DecodeTrace::draw_annotations(vector annotati // Annotation wider than the threshold for a useful label width? if (a_width >= min_useful_label_width_) { - for (const QString &ann_text : a.annotations()) { + for (const QString &ann_text : *(a->annotations())) { const qreal 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) { @@ -660,17 +741,16 @@ void DecodeTrace::draw_annotations(vector annotati if ((abs(delta) > 1) || a_is_separate) { // Block was broken, draw annotations that form the current block if (block_ann_count == 1) - draw_annotation(*prev_ann, p, h, pp, y, row_color, - row_title_width); + draw_annotation(prev_ann, p, pp, y, row); else if (block_ann_count > 0) draw_annotation_block(block_start, prev_end, block_class, - block_class_uniform, p, h, y, row_color); + block_class_uniform, p, y, row); block_ann_count = 0; } if (a_is_separate) { - draw_annotation(a, p, h, pp, y, row_color, row_title_width); + draw_annotation(a, p, pp, y, row); // Next annotation must start a new block. delta will be > 1 // because we set prev_end to INT_MIN but that's okay since // block_ann_count will be 0 and nothing will be drawn @@ -678,14 +758,14 @@ void DecodeTrace::draw_annotations(vector annotati block_ann_count = 0; } else { prev_end = a_end; - prev_ann = &a; + prev_ann = a; if (block_ann_count == 0) { block_start = a_start; - block_class = a.ann_class(); + block_class = a->ann_class_id(); block_class_uniform = true; } else - if (a.ann_class() != block_class) + if (a->ann_class_id() != block_class) block_class_uniform = false; block_ann_count++; @@ -693,88 +773,83 @@ void DecodeTrace::draw_annotations(vector annotati } if (block_ann_count == 1) - draw_annotation(*prev_ann, p, h, pp, y, row_color, row_title_width); + draw_annotation(prev_ann, p, pp, y, row); else if (block_ann_count > 0) draw_annotation_block(block_start, prev_end, block_class, - block_class_uniform, p, h, y, row_color); + block_class_uniform, p, y, row); } -void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, - QPainter &p, int h, const ViewItemPaintParams &pp, int y, - QColor row_color, int row_title_width) const +void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p, + const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) const { double samples_per_pixel, pixels_offset; tie(pixels_offset, samples_per_pixel) = get_pixels_offset_samples_per_pixel(); - const double start = a.start_sample() / samples_per_pixel - - pixels_offset; - const double end = a.end_sample() / samples_per_pixel - pixels_offset; + const double start = a->start_sample() / samples_per_pixel - pixels_offset; + const double end = a->end_sample() / samples_per_pixel - pixels_offset; - QColor color = get_annotation_color(row_color, a.ann_class()); - p.setPen(color.darker()); - p.setBrush(color); + p.setPen(a->dark_color()); + p.setBrush(a->color()); - if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding) + if ((start > (pp.right() + DrawPadding)) || (end < (pp.left() - DrawPadding))) return; - if (a.start_sample() == a.end_sample()) - draw_instant(a, p, h, start, y); + if (a->start_sample() == a->end_sample()) + draw_instant(a, p, start, y); else - draw_range(a, p, h, start, end, y, pp, row_title_width); + draw_range(a, p, start, end, y, pp, row.title_width); } void DecodeTrace::draw_annotation_block(qreal start, qreal end, - Annotation::Class ann_class, bool use_ann_format, QPainter &p, int h, - int y, QColor row_color) const + Annotation::Class ann_class, bool use_ann_format, QPainter &p, int y, + const DecodeTraceRow& row) const { - const double top = y + .5 - h / 2; - const double bottom = y + .5 + h / 2; - - const QRectF rect(start, top, end - start, bottom - top); - const int r = h / 4; - - p.setPen(QPen(Qt::NoPen)); - p.setBrush(Qt::white); - p.drawRoundedRect(rect, r, r); + const double top = y + .5 - annotation_height_ / 2; + const double bottom = y + .5 + annotation_height_ / 2; + const double width = end - start; // If all annotations in this block are of the same type, we can use the // one format that all of these annotations have. Otherwise, we should use // a neutral color (i.e. gray) if (use_ann_format) { - const QColor color = get_annotation_color(row_color, ann_class); - p.setPen(color.darker()); - p.setBrush(QBrush(color, Qt::Dense4Pattern)); + p.setPen(row.decode_row->get_dark_class_color(ann_class)); + p.setBrush(QBrush(row.decode_row->get_class_color(ann_class), Qt::Dense4Pattern)); } else { - p.setPen(Qt::gray); + p.setPen(QColor(Qt::darkGray)); p.setBrush(QBrush(Qt::gray, Qt::Dense4Pattern)); } - p.drawRoundedRect(rect, r, r); + if (width <= 1) + p.drawLine(QPointF(start, top), QPointF(start, bottom)); + else { + const QRectF rect(start, top, width, bottom - top); + const int r = annotation_height_ / 4; + p.drawRoundedRect(rect, r, r); + } } -void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal x, int y) const +void DecodeTrace::draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const { - const QString text = a.annotations().empty() ? - QString() : a.annotations().back(); + const QString text = a->annotations()->empty() ? + QString() : a->annotations()->back(); const qreal w = min((qreal)p.boundingRect(QRectF(), 0, text).width(), - 0.0) + h; - const QRectF rect(x - w / 2, y - h / 2, w, h); + 0.0) + annotation_height_; + const QRectF rect(x - w / 2, y - annotation_height_ / 2, w, annotation_height_); - p.drawRoundedRect(rect, h / 2, h / 2); + p.drawRoundedRect(rect, annotation_height_ / 2, annotation_height_ / 2); p.setPen(Qt::black); p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text); } -void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp, +void DecodeTrace::draw_range(const Annotation* a, QPainter &p, + qreal start, qreal end, int y, const ViewItemPaintParams &pp, int row_title_width) const { - const qreal top = y + .5 - h / 2; - const qreal bottom = y + .5 + h / 2; - const vector annotations = a.annotations(); + const qreal top = y + .5 - annotation_height_ / 2; + const qreal bottom = y + .5 + annotation_height_ / 2; + const vector* annotations = a->annotations(); // If the two ends are within 1 pixel, draw a vertical line if (start + 1.0 > end) { @@ -795,7 +870,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, p.drawConvexPolygon(pts, countof(pts)); - if (annotations.empty()) + if (annotations->empty()) return; const int ann_start = start + cap_width; @@ -805,7 +880,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, const int real_end = min(ann_end, pp.right()); const int real_width = real_end - real_start; - QRectF rect(real_start, y - h / 2, real_width, h); + QRectF rect(real_start, y - annotation_height_ / 2, real_width, annotation_height_); if (rect.width() <= 4) return; @@ -815,14 +890,14 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, QString best_annotation; int best_width = 0; - for (const QString &a : annotations) { - const int w = p.boundingRect(QRectF(), 0, a).width(); + for (const QString &s : *annotations) { + const int w = p.boundingRect(QRectF(), 0, s).width(); if (w <= rect.width() && w > best_width) - best_annotation = a, best_width = w; + best_annotation = s, best_width = w; } if (best_annotation.isEmpty()) - best_annotation = annotations.back(); + best_annotation = annotations->back(); // If not ellide the last in the list p.drawText(rect, Qt::AlignCenter, p.fontMetrics().elidedText( @@ -851,11 +926,8 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, p.drawText(text_rect, message); } -void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right) const +void DecodeTrace::draw_unresolved_period(QPainter &p, int left, int right) const { - using namespace pv::data; - using pv::data::decode::Decoder; - double samples_per_pixel, pixels_offset; const int64_t sample_count = decode_signal_->get_working_sample_count(current_segment_); @@ -874,7 +946,8 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right samples_per_pixel - pixels_offset, left - 1.0); const double end = min(sample_count / samples_per_pixel - pixels_offset, right + 1.0); - const QRectF no_decode_rect(start, y - (h / 2) - 0.5, end - start, h); + const QRectF no_decode_rect(start, y - (annotation_height_ / 2) - 0.5, + end - start, annotation_height_); p.setPen(QPen(Qt::NoPen)); p.setBrush(Qt::white); @@ -922,34 +995,6 @@ pair DecodeTrace::get_view_sample_range( return make_pair(start, end); } -QColor DecodeTrace::get_row_color(int row_index) const -{ - // For each row color, use the base color hue and add an offset that's - // not a dividend of 360 - - QColor color; - const int h = (base_->color().toHsv().hue() + 20 * row_index) % 360; - const int s = DECODETRACE_COLOR_SATURATION; - const int v = DECODETRACE_COLOR_VALUE; - color.setHsl(h, s, v); - - return color; -} - -QColor DecodeTrace::get_annotation_color(QColor row_color, int annotation_index) const -{ - // For each row color, use the base color hue and add an offset that's - // not a dividend of 360 and not a multiple of the row offset - - QColor color(row_color); - const int h = (color.toHsv().hue() + 55 * annotation_index) % 360; - const int s = DECODETRACE_COLOR_SATURATION; - const int v = DECODETRACE_COLOR_VALUE; - color.setHsl(h, s, v); - - return color; -} - unsigned int DecodeTrace::get_row_y(const DecodeTraceRow* row) const { assert(row); @@ -988,8 +1033,6 @@ DecodeTraceRow* DecodeTrace::get_row_at_point(const QPoint &point) const QString DecodeTrace::get_annotation_at_point(const QPoint &point) { - using namespace pv::data::decode; - if (!enabled()) return QString(); @@ -1003,18 +1046,17 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) if (point.y() > (int)(get_row_y(r) + (annotation_height_ / 2))) return QString(); - vector annotations; + deque annotations; decode_signal_->get_annotation_subset(annotations, r->decode_row, current_segment_, sample_range.first, sample_range.second); return (annotations.empty()) ? - QString() : annotations[0].annotations().front(); + QString() : annotations[0]->annotations()->front(); } -void DecodeTrace::create_decoder_form(int index, - shared_ptr &dec, QWidget *parent, - QFormLayout *form) +void DecodeTrace::create_decoder_form(int index, shared_ptr &dec, + QWidget *parent, QFormLayout *form) { GlobalSettings settings; @@ -1030,7 +1072,7 @@ void DecodeTrace::create_decoder_form(int index, tr("%1:\n%2").arg(QString::fromUtf8(decoder->longname), QString::fromUtf8(decoder->desc)), nullptr, decoder_deletable); - group->set_decoder_visible(dec->shown()); + group->set_decoder_visible(dec->visible()); if (decoder_deletable) { delete_mapper_.setMapping(group, index); @@ -1135,10 +1177,8 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent, return selector; } -void DecodeTrace::export_annotations(vector *annotations) const +void DecodeTrace::export_annotations(deque& annotations) const { - using namespace pv::data::decode; - GlobalSettings settings; const QString dir = settings.value("MainWindow/SaveDirectory").toString(); @@ -1152,30 +1192,54 @@ void DecodeTrace::export_annotations(vector *annotations) const const QString quote = format.contains("%q") ? "\"" : ""; format = format.remove("%q"); + const bool has_sample_range = format.contains("%s"); + const bool has_row_name = format.contains("%r"); + const bool has_dec_name = format.contains("%d"); + const bool has_class_name = format.contains("%c"); + const bool has_first_ann_text = format.contains("%1"); + const bool has_all_ann_text = format.contains("%a"); + QFile file(file_name); if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { QTextStream out_stream(&file); - for (Annotation &ann : *annotations) { - const QString sample_range = QString("%1-%2") \ - .arg(QString::number(ann.start_sample()), QString::number(ann.end_sample())); + for (const Annotation* ann : annotations) { + QString out_text = format; - const QString row_name = quote + ann.row()->description() + quote; + if (has_sample_range) { + const QString sample_range = QString("%1-%2") \ + .arg(QString::number(ann->start_sample()), QString::number(ann->end_sample())); + out_text = out_text.replace("%s", sample_range); + } - QString all_ann_text; - for (const QString &s : ann.annotations()) - all_ann_text = all_ann_text + quote + s + quote + ","; - all_ann_text.chop(1); + if (has_dec_name) + out_text = out_text.replace("%d", + quote + QString::fromUtf8(ann->row()->decoder()->name()) + quote); - const QString first_ann_text = quote + ann.annotations().front() + quote; + if (has_row_name) { + const QString row_name = quote + ann->row()->description() + quote; + out_text = out_text.replace("%r", row_name); + } + + if (has_class_name) { + const QString class_name = quote + ann->ann_class_name() + quote; + out_text = out_text.replace("%c", class_name); + } + + if (has_first_ann_text) { + const QString first_ann_text = quote + ann->annotations()->front() + quote; + out_text = out_text.replace("%1", first_ann_text); + } + + if (has_all_ann_text) { + QString all_ann_text; + for (const QString &s : *(ann->annotations())) + all_ann_text = all_ann_text + quote + s + quote + ","; + all_ann_text.chop(1); + + out_text = out_text.replace("%a", all_ann_text); + } - QString out_text = format; - out_text = out_text.replace("%s", sample_range); - out_text = out_text.replace("%d", - quote + QString::fromUtf8(ann.row()->decoder()->name()) + quote); - out_text = out_text.replace("%r", row_name); - out_text = out_text.replace("%1", first_ann_text); - out_text = out_text.replace("%a", all_ann_text); out_stream << out_text << '\n'; } @@ -1192,6 +1256,7 @@ void DecodeTrace::export_annotations(vector *annotations) const void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) { + // Set colors and fixed widths QFontMetrics m(QApplication::font()); QPalette header_palette = owner_->view()->palette(); @@ -1212,27 +1277,30 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) const int w = m.boundingRect(r->decode_row->title()).width() + RowTitleMargin; r->title_width = w; - r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(), - r->expanded_height - 2 * default_row_height_); - r->container->setVisible(false); + // Set up top-level container + connect(r->container, SIGNAL(widgetResized(QWidget*)), + this, SLOT(on_row_container_resized(QWidget*))); QVBoxLayout* vlayout = new QVBoxLayout(); r->container->setLayout(vlayout); - // Add header container with checkbox for this row + // Add header container vlayout->addWidget(r->header_container); vlayout->setContentsMargins(0, 0, 0, 0); vlayout->setSpacing(0); + QHBoxLayout* header_container_layout = new QHBoxLayout(); r->header_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); r->header_container->setMinimumSize(0, default_row_height_); - r->header_container->setLayout(new QVBoxLayout()); - r->header_container->layout()->setContentsMargins(10, 2, 0, 2); + r->header_container->setLayout(header_container_layout); + r->header_container->layout()->setContentsMargins(10, 2, 10, 2); r->header_container->setAutoFillBackground(true); r->header_container->setPalette(header_palette); + // Add widgets inside the header container QCheckBox* cb = new QCheckBox(); - r->header_container->layout()->addWidget(cb); + r->row_visibility_checkbox = cb; + header_container_layout->addWidget(cb); cb->setText(tr("Show this row")); cb->setChecked(r->decode_row->visible()); @@ -1240,11 +1308,28 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) connect(cb, SIGNAL(stateChanged(int)), &row_show_hide_mapper_, SLOT(map())); + QPushButton* btn = new QPushButton(); + header_container_layout->addWidget(btn); + btn->setFlat(true); + btn->setStyleSheet(":hover { background-color: palette(button); color: palette(button-text); border:0; }"); + btn->setText(tr("Show All")); + btn->setProperty("decode_trace_row_ptr", QVariant::fromValue((void*)r)); + connect(btn, SIGNAL(clicked(bool)), this, SLOT(on_show_all_classes())); + + btn = new QPushButton(); + header_container_layout->addWidget(btn); + btn->setFlat(true); + btn->setStyleSheet(":hover { background-color: palette(button); color: palette(button-text); border:0; }"); + btn->setText(tr("Hide All")); + btn->setProperty("decode_trace_row_ptr", QVariant::fromValue((void*)r)); + connect(btn, SIGNAL(clicked(bool)), this, SLOT(on_hide_all_classes())); + + header_container_layout->addStretch(); // To left-align the header widgets + // Add selector container vlayout->addWidget(r->selector_container); - r->selector_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - r->selector_container->setMinimumSize(0, 3 * default_row_height_); // FIXME - r->selector_container->setLayout(new QHBoxLayout()); + r->selector_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + r->selector_container->setLayout(new FlowLayout(r->selector_container)); r->selector_container->setAutoFillBackground(true); r->selector_container->setPalette(selector_palette); @@ -1257,7 +1342,13 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) cb->setText(tr(ann_class->description)); cb->setChecked(ann_class->visible); + int dim = ViewItemPaintParams::text_height() - 2; + QPixmap pixmap(dim, dim); + pixmap.fill(r->decode_row->get_class_color(ann_class->id)); + cb->setIcon(pixmap); + r->selector_container->layout()->addWidget(cb); + r->selectors.push_back(cb); cb->setProperty("ann_class_ptr", QVariant::fromValue((void*)ann_class)); cb->setProperty("decode_trace_row_ptr", QVariant::fromValue((void*)r)); @@ -1270,6 +1361,9 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) void DecodeTrace::update_rows() { + if (!owner_) + return; + lock_guard lock(row_modification_mutex_); for (DecodeTraceRow& r : rows_) @@ -1286,6 +1380,7 @@ void DecodeTrace::update_rows() // Row doesn't exist yet, create and append it DecodeTraceRow nr; nr.decode_row = decode_row; + nr.decode_row->set_base_color(base_->color()); nr.height = default_row_height_; nr.expanded_height = default_row_height_; nr.currently_visible = false; @@ -1295,7 +1390,7 @@ void DecodeTrace::update_rows() nr.expanded = false; nr.collapsing = false; nr.expand_marker_shape = default_marker_shape_; - nr.container = new QWidget(owner_->view()->scrollarea()); + nr.container = new ContainerWidget(owner_->view()->scrollarea()); nr.header_container = new QWidget(nr.container); nr.selector_container = new QWidget(nr.container); @@ -1309,6 +1404,10 @@ void DecodeTrace::update_rows() row_id++; } + // If there's only one row, it must not be hidden or else it can't be un-hidden + if (row_id == 1) + rows_.front().row_visibility_checkbox->setEnabled(false); + // Remove any rows that no longer exist, obeying that iterators are invalidated bool any_exists; do { @@ -1316,6 +1415,8 @@ void DecodeTrace::update_rows() for (unsigned int i = 0; i < rows_.size(); i++) if (!rows_[i].exists) { + delete rows_[i].row_visibility_checkbox; + for (QCheckBox* cb : rows_[i].selectors) delete cb; @@ -1343,8 +1444,6 @@ void DecodeTrace::set_row_expanded(DecodeTraceRow* r) r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(), r->height - 2 * default_row_height_); - - max_visible_rows_ = 0; } void DecodeTrace::set_row_collapsed(DecodeTraceRow* r) @@ -1357,16 +1456,28 @@ void DecodeTrace::set_row_collapsed(DecodeTraceRow* r) r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(), r->height - 2 * default_row_height_); - - max_visible_rows_ = 0; } void DecodeTrace::update_expanded_rows() { for (DecodeTraceRow& r : rows_) { - - r.container->move(2 * ArrowSize, - get_row_y(&r) + default_row_height_); + if (r.expanding || r.expanded) + r.expanded_height = 2 * default_row_height_ + r.container->sizeHint().height(); + + if (r.expanded) + r.height = r.expanded_height; + + int x = 2 * ArrowSize; + int y = get_row_y(&r) + default_row_height_; + // Only update the position if it actually changes + if ((x != r.container->pos().x()) || (y != r.container->pos().y())) + r.container->move(x, y); + + int w = owner_->view()->viewport()->width() - x; + int h = r.height - 2 * default_row_height_; + // Only update the dimension if they actually change + if ((w != r.container->sizeHint().width()) || (h != r.container->sizeHint().height())) + r.container->resize(w, h); } } @@ -1374,10 +1485,14 @@ void DecodeTrace::on_setting_changed(const QString &key, const QVariant &value) { Trace::on_setting_changed(key, value); - if (key == GlobalSettings::Key_Dec_AlwaysShowAllRows) { - max_visible_rows_ = 0; + if (key == GlobalSettings::Key_Dec_AlwaysShowAllRows) always_show_all_rows_ = value.toBool(); - } +} + +void DecodeTrace::on_color_changed(const QColor &color) +{ + for (DecodeTraceRow& r : rows_) + r.decode_row->set_base_color(color); } void DecodeTrace::on_new_annotations() @@ -1394,7 +1509,6 @@ void DecodeTrace::on_delayed_trace_update() void DecodeTrace::on_decode_reset() { - max_visible_rows_ = 0; update_rows(); if (owner_) @@ -1466,8 +1580,6 @@ void DecodeTrace::on_delete_decoder(int index) decode_signal_->remove_decoder(index); update_rows(); - // Force re-calculation of the trace height - max_visible_rows_ = 0; owner_->extents_changed(false, true); create_popup_form(); @@ -1480,11 +1592,8 @@ void DecodeTrace::on_show_hide_decoder(int index) assert(index < (int)decoder_forms_.size()); decoder_forms_[index]->set_decoder_visible(state); - if (!state) { - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; + if (!state) owner_->extents_changed(false, true); - } owner_->row_item_appearance_changed(false, true); } @@ -1494,11 +1603,11 @@ void DecodeTrace::on_show_hide_row(int row_id) if (row_id >= (int)rows_.size()) return; - set_row_collapsed(&rows_[row_id]); rows_[row_id].decode_row->set_visible(!rows_[row_id].decode_row->visible()); - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; + if (!rows_[row_id].decode_row->visible()) + set_row_collapsed(&rows_[row_id]); + owner_->extents_changed(false, true); owner_->row_item_appearance_changed(false, true); } @@ -1520,28 +1629,60 @@ void DecodeTrace::on_show_hide_class(QWidget* sender) owner_->row_item_appearance_changed(false, true); } -void DecodeTrace::on_copy_annotation_to_clipboard() +void DecodeTrace::on_show_all_classes() +{ + void* row_ptr = QObject::sender()->property("decode_trace_row_ptr").value(); + assert(row_ptr); + DecodeTraceRow* row = (DecodeTraceRow*)row_ptr; + + for (QCheckBox* cb : row->selectors) + cb->setChecked(true); + + row->has_hidden_classes = false; + + owner_->row_item_appearance_changed(false, true); +} + +void DecodeTrace::on_hide_all_classes() +{ + void* row_ptr = QObject::sender()->property("decode_trace_row_ptr").value(); + assert(row_ptr); + DecodeTraceRow* row = (DecodeTraceRow*)row_ptr; + + for (QCheckBox* cb : row->selectors) + cb->setChecked(false); + + row->has_hidden_classes = true; + + owner_->row_item_appearance_changed(false, true); +} + +void DecodeTrace::on_row_container_resized(QWidget* sender) { - using namespace pv::data::decode; + sender->update(); + + owner_->extents_changed(false, true); + owner_->row_item_appearance_changed(false, true); +} +void DecodeTrace::on_copy_annotation_to_clipboard() +{ if (!selected_row_) return; - vector *annotations = new vector(); + deque annotations; - decode_signal_->get_annotation_subset(*annotations, selected_row_, + decode_signal_->get_annotation_subset(annotations, selected_row_, current_segment_, selected_sample_range_.first, selected_sample_range_.first); - if (annotations->empty()) + if (annotations.empty()) return; QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(annotations->front().annotations().front(), QClipboard::Clipboard); + clipboard->setText(annotations.front()->annotations()->front(), QClipboard::Clipboard); if (clipboard->supportsSelection()) - clipboard->setText(annotations->front().annotations().front(), QClipboard::Selection); - - delete annotations; + clipboard->setText(annotations.front()->annotations()->front(), QClipboard::Selection); } void DecodeTrace::on_export_row() @@ -1610,36 +1751,29 @@ void DecodeTrace::on_export_all_rows_with_cursor() void DecodeTrace::on_export_row_from_here() { - using namespace pv::data::decode; - if (!selected_row_) return; - vector *annotations = new vector(); + deque annotations; - decode_signal_->get_annotation_subset(*annotations, selected_row_, + decode_signal_->get_annotation_subset(annotations, selected_row_, current_segment_, selected_sample_range_.first, selected_sample_range_.second); - if (annotations->empty()) + if (annotations.empty()) return; export_annotations(annotations); - delete annotations; } void DecodeTrace::on_export_all_rows_from_here() { - using namespace pv::data::decode; - - vector *annotations = new vector(); + deque annotations; - decode_signal_->get_annotation_subset(*annotations, current_segment_, + decode_signal_->get_annotation_subset(annotations, current_segment_, selected_sample_range_.first, selected_sample_range_.second); - if (!annotations->empty()) + if (!annotations.empty()) export_annotations(annotations); - - delete annotations; } void DecodeTrace::on_animation_timer() @@ -1655,7 +1789,7 @@ void DecodeTrace::on_animation_timer() if (r.expanding) { if (r.height < r.expanded_height) { r.anim_height += height_delta / (float)AnimationDurationInTicks; - r.height = r.anim_height; + r.height = min((int)r.anim_height, (int)r.expanded_height); r.anim_shape += ArrowSize / (float)AnimationDurationInTicks; animation_finished = false; } else @@ -1665,7 +1799,7 @@ void DecodeTrace::on_animation_timer() if (r.collapsing) { if (r.height > default_row_height_) { r.anim_height -= height_delta / (float)AnimationDurationInTicks; - r.height = r.anim_height; + r.height = max((int)r.anim_height, (int)0); r.anim_shape -= ArrowSize / (float)AnimationDurationInTicks; animation_finished = false; } else @@ -1688,6 +1822,23 @@ void DecodeTrace::on_animation_timer() owner_->row_item_appearance_changed(false, true); } +void DecodeTrace::on_hide_hidden_rows() +{ + // Make all hidden traces invisible again unless the user is hovering over a row name + bool any_highlighted = false; + + for (DecodeTraceRow& r : rows_) + if (r.expand_marker_highlighted) + any_highlighted = true; + + if (!any_highlighted) { + show_hidden_rows_ = false; + + owner_->extents_changed(false, true); + owner_->row_item_appearance_changed(false, true); + } +} + } // namespace trace } // namespace views } // namespace pv