X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=8ca8d580c8b4a4bb4fadf89e84421491fd567056;hb=440bdf504a05efe589e8954ad28be62ba2c2d325;hp=a91f5e03985504a585e0f5dfe08f1c78ce47d7c2;hpb=65bde9b3e02f7ad11f88ba4eac9d1c3ce7933437;p=pulseview.git diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index a91f5e03..8ca8d580 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -88,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; @@ -97,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() @@ -150,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) @@ -206,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); @@ -281,7 +288,8 @@ 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; } @@ -296,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) { @@ -340,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 @@ -366,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; @@ -589,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 @@ -1191,30 +1209,54 @@ void DecodeTrace::export_annotations(deque& annotations) cons 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())); + 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'; } @@ -1282,8 +1324,6 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) connect(cb, SIGNAL(stateChanged(int)), &row_show_hide_mapper_, SLOT(map())); - cb->setEnabled(false); - QPushButton* btn = new QPushButton(); header_container_layout->addWidget(btn); btn->setFlat(true); @@ -1585,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); @@ -1804,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