X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=8ca8d580c8b4a4bb4fadf89e84421491fd567056;hb=440bdf504a05efe589e8954ad28be62ba2c2d325;hp=0715981c5c7366369b2a5e7a9743381f14639743;hpb=adf9e02242336548a384c23dadc062af7a2ef83a;p=pulseview.git diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index 0715981c..8ca8d580 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -67,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; @@ -89,6 +88,7 @@ namespace trace { 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; @@ -98,8 +98,8 @@ 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() @@ -151,6 +151,7 @@ DecodeTrace::DecodeTrace(pv::Session &session, Trace(signalbase), session_(session), max_visible_rows_(0), + show_hidden_rows_(false), delete_mapper_(this), show_hide_mapper_(this), row_show_hide_mapper_(this) @@ -207,6 +208,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); @@ -282,12 +288,13 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) // 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()->visible()) || (!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); @@ -297,8 +304,8 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) 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_ || r.has_hidden_classes) && - (ann_count > 0); + r.currently_visible = ((always_show_all_rows_ || r.has_hidden_classes) && + (ann_count > 0)) || r.expanded; } if (r.currently_visible) { @@ -341,6 +348,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 @@ -367,7 +376,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; @@ -590,8 +603,12 @@ 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() < (int)(ArrowSize + 3 + hover_row->title_width)) && - (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) + (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 @@ -666,7 +683,7 @@ void DecodeTrace::mouse_left_press_event(const QMouseEvent* event) } } -void DecodeTrace::draw_annotations(vector annotations, +void DecodeTrace::draw_annotations(deque& annotations, QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) { Annotation::Class block_class = 0; @@ -699,7 +716,7 @@ void DecodeTrace::draw_annotations(vector annotations, // 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) { @@ -734,10 +751,10 @@ void DecodeTrace::draw_annotations(vector annotations, 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++; @@ -761,11 +778,10 @@ void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p, const double start = a->start_sample() / samples_per_pixel - pixels_offset; const double end = a->end_sample() / samples_per_pixel - pixels_offset; - QColor color = row.ann_class_color.at(a->ann_class()); - p.setPen(color.darker()); - p.setBrush(color); + p.setPen(row.ann_class_dark_color.at(a->ann_class_id())); + p.setBrush(row.ann_class_color.at(a->ann_class_id())); - 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()) @@ -780,33 +796,32 @@ void DecodeTrace::draw_annotation_block(qreal start, qreal end, { const double top = y + .5 - annotation_height_ / 2; const double bottom = y + .5 + annotation_height_ / 2; - - const QRectF rect(start, top, end - start, bottom - top); - const int r = annotation_height_ / 4; - - p.setPen(QPen(Qt::NoPen)); - p.setBrush(Qt::white); - p.drawRoundedRect(rect, r, r); + 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 = row.ann_class_color.at(ann_class); - p.setPen(color.darker()); - p.setBrush(QBrush(color, Qt::Dense4Pattern)); + p.setPen(row.ann_class_dark_color.at(ann_class)); + p.setBrush(QBrush(row.ann_class_color.at(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 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) + annotation_height_; const QRectF rect(x - w / 2, y - annotation_height_ / 2, w, annotation_height_); @@ -823,7 +838,7 @@ void DecodeTrace::draw_range(const Annotation* a, QPainter &p, { const qreal top = y + .5 - annotation_height_ / 2; const qreal bottom = y + .5 + annotation_height_ / 2; - const vector annotations = a->annotations(); + const vector* annotations = a->annotations(); // If the two ends are within 1 pixel, draw a vertical line if (start + 1.0 > end) { @@ -844,7 +859,7 @@ void DecodeTrace::draw_range(const Annotation* a, QPainter &p, p.drawConvexPolygon(pts, countof(pts)); - if (annotations.empty()) + if (annotations->empty()) return; const int ann_start = start + cap_width; @@ -864,14 +879,14 @@ void DecodeTrace::draw_range(const Annotation* a, QPainter &p, QString best_annotation; int best_width = 0; - for (const QString &s : annotations) { + for (const QString &s : *annotations) { const int w = p.boundingRect(QRectF(), 0, s).width(); if (w <= rect.width() && w > best_width) 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( @@ -1048,13 +1063,13 @@ 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, @@ -1179,7 +1194,7 @@ 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 { GlobalSettings settings; const QString dir = settings.value("MainWindow/SaveDirectory").toString(); @@ -1194,30 +1209,54 @@ void DecodeTrace::export_annotations(vector *annotations) con 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 (const 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; + + 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); + } - const QString row_name = quote + ann->row()->description() + quote; + if (has_dec_name) + out_text = out_text.replace("%d", + quote + QString::fromUtf8(ann->row()->decoder()->name()) + quote); - 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_row_name) { + const QString row_name = quote + ann->row()->description() + quote; + out_text = out_text.replace("%r", row_name); + } - const QString first_ann_text = quote + ann->annotations().front() + quote; + 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'; } @@ -1262,20 +1301,22 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) 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); + header_container_layout->addWidget(cb); cb->setText(tr("Show this row")); cb->setChecked(r->decode_row->visible()); @@ -1283,6 +1324,24 @@ 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::Expanding); @@ -1305,6 +1364,7 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_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)); @@ -1349,9 +1409,12 @@ void DecodeTrace::update_rows() nr.row_color = get_row_color(decode_row->index()); vector ann_classes = decode_row->ann_classes(); - for (const AnnotationClass* ann_class : ann_classes) + for (const AnnotationClass* ann_class : ann_classes) { nr.ann_class_color[ann_class->id] = get_annotation_color(nr.row_color, ann_class->id); + nr.ann_class_dark_color[ann_class->id] = + nr.ann_class_color[ann_class->id].darker(); + } rows_.push_back(nr); r = &rows_.back(); @@ -1562,9 +1625,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()); + if (!rows_[row_id].decode_row->visible()) + set_row_collapsed(&rows_[row_id]); + // Force re-calculation of the trace height, see paint_mid() max_visible_rows_ = 0; owner_->extents_changed(false, true); @@ -1588,6 +1653,34 @@ void DecodeTrace::on_show_hide_class(QWidget* sender) owner_->row_item_appearance_changed(false, true); } +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) { sender->update(); @@ -1601,21 +1694,19 @@ 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() @@ -1687,29 +1778,26 @@ void DecodeTrace::on_export_row_from_here() 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() { - 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() @@ -1758,6 +1846,25 @@ 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; + + // Force re-calculation of the trace height, see paint_mid() + max_visible_rows_ = 0; + owner_->extents_changed(false, true); + owner_->row_item_appearance_changed(false, true); + } +} + } // namespace trace } // namespace views } // namespace pv