DecodeTrace: Allow row hiding

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 5cc03fa42ef75f326ed6f46897b54b94d67b5591..8ca8d580c8b4a4bb4fadf89e84421491fd567056 100644 (file)
--- 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;
                }
@@ -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
@@ -1306,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);
@@ -1609,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);
@@ -1828,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

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index f8976cb7b2da84a22c0968715972e67affbfd3c1..b6791c4381af50a5c81396bc7ecf217e0506738d 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -125,6 +125,7 @@ private:
        static const QColor ErrorBgColor;
        static const QColor NoDecodeColor;
        static const QColor ExpandMarkerWarnColor;
+       static const QColor ExpandMarkerHiddenColor;
        static const uint8_t ExpansionAreaHeaderAlpha;
        static const uint8_t ExpansionAreaAlpha;
 
@@ -134,7 +135,8 @@ private:
        static const int DrawPadding;
 
        static const int MaxTraceUpdateRate;
-       static const unsigned int AnimationDurationInTicks;
+       static const int AnimationDurationInTicks;
+       static const int HiddenRowHideDelay;
 
 public:
        DecodeTrace(pv::Session &session, shared_ptr<SignalBase> signalbase,
@@ -289,6 +291,7 @@ private Q_SLOTS:
        void on_export_all_rows_from_here();
 
        void on_animation_timer();
+       void on_hide_hidden_rows();
 
 private:
        pv::Session &session_;
@@ -311,12 +314,12 @@ private:
        unsigned int visible_rows_, max_visible_rows_;
 
        int min_useful_label_width_;
-       bool always_show_all_rows_;
+       bool always_show_all_rows_, show_hidden_rows_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
        QSignalMapper row_show_hide_mapper_, class_show_hide_mapper_;
 
-       QTimer delayed_trace_updater_, animation_timer_;
+       QTimer delayed_trace_updater_, animation_timer_, delayed_hidden_row_hider_;
 
        QPolygon default_marker_shape_;