From 74bf66669012692f7eda790abe724bd5bb4ae8c6 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Mon, 23 Dec 2019 11:55:46 +0100 Subject: [PATCH] Implement expansion marker animation and its infrastructure --- pv/views/trace/decodetrace.cpp | 225 +++++++++++++++++++++++---------- pv/views/trace/decodetrace.hpp | 24 +++- pv/views/trace/view.cpp | 10 ++ pv/views/trace/view.hpp | 1 - pv/views/trace/viewitem.cpp | 5 + pv/views/trace/viewitem.hpp | 7 + pv/views/viewbase.hpp | 2 +- 7 files changed, 198 insertions(+), 76 deletions(-) diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index 8ea6f744..61163bc2 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -86,12 +86,13 @@ namespace trace { const QColor DecodeTrace::ErrorBgColor = QColor(0xEF, 0x29, 0x29); const QColor DecodeTrace::NoDecodeColor = QColor(0x88, 0x8A, 0x85); -const int DecodeTrace::ArrowSize = 7; +const int DecodeTrace::ArrowSize = 6; const double DecodeTrace::EndCapWidth = 5; -const int DecodeTrace::RowTitleMargin = 10; +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; DecodeTrace::DecodeTrace(pv::Session &session, shared_ptr signalbase, int index) : @@ -144,6 +145,14 @@ DecodeTrace::DecodeTrace(pv::Session &session, this, SLOT(on_delayed_trace_update())); delayed_trace_updater_.setSingleShot(true); delayed_trace_updater_.setInterval(1000 / MaxTraceUpdateRate); + + connect(&animation_timer_, SIGNAL(timeout()), + this, SLOT(on_animation_timer())); + animation_timer_.setInterval(1000 / 50); + + default_marker_shape_ << QPoint(0, -ArrowSize); + default_marker_shape_ << QPoint(ArrowSize, 0); + default_marker_shape_ << QPoint(0, ArrowSize); } DecodeTrace::~DecodeTrace() @@ -251,17 +260,14 @@ void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp) p.setPen(QPen(Qt::NoPen)); if (r.expand_marker_highlighted) - p.setBrush(QApplication::palette().brush(QPalette::HighlightedText)); + p.setBrush(QApplication::palette().brush(QPalette::Highlight)); else p.setBrush(QApplication::palette().brush(QPalette::WindowText)); // Draw expansion marker - const QPointF points[] = { - QPointF(pp.left(), y - ArrowSize), - QPointF(pp.left() + ArrowSize, y), - QPointF(pp.left(), y + ArrowSize) - }; - p.drawPolygon(points, countof(points)); + QPolygon marker(r.expand_marker_shape); + marker.translate(pp.left(), y); + p.drawPolygon(marker); p.setBrush(QApplication::palette().brush(QPalette::WindowText)); @@ -484,6 +490,91 @@ QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos) return menu; } +void DecodeTrace::delete_pressed() +{ + on_delete(); +} + +void DecodeTrace::hover_point_changed(const QPoint &hp) +{ + Trace::hover_point_changed(hp); + + assert(owner_); + + RowData* hover_row = get_row_at_point(hp); + + // Row expansion marker handling + for (RowData& r : rows_) + r.expand_marker_highlighted = false; + + 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))) + hover_row->expand_marker_highlighted = true; + } + + // Tooltip handling + if (hp.x() > 0) { + QString ann = get_annotation_at_point(hp); + + if (!ann.isEmpty()) { + QFontMetrics m(QToolTip::font()); + const QRect text_size = m.boundingRect(QRect(), 0, ann); + + // This is OS-specific and unfortunately we can't query it, so + // use an approximation to at least try to minimize the error. + const int padding = default_row_height_ + 8; + + // Make sure the tool tip doesn't overlap with the mouse cursor. + // If it did, the tool tip would constantly hide and re-appear. + // We also push it up by one row so that it appears above the + // decode trace, not below. + QPoint p = hp; + p.setX(hp.x() - (text_size.width() / 2) - padding); + + p.setY(get_row_y(hover_row) - default_row_height_ - + text_size.height() - padding); + + const View *const view = owner_->view(); + assert(view); + QToolTip::showText(view->viewport()->mapToGlobal(p), ann); + + } else + QToolTip::hideText(); + + } else + QToolTip::hideText(); +} + +void DecodeTrace::mouse_left_press_event(const QMouseEvent* event) +{ + // Handle row expansion marker + for (RowData& r : rows_) { + if (!r.expand_marker_highlighted) + continue; + + unsigned int y = get_row_y(&r); + if ((event->x() > 0) && (event->x() <= (int)(ArrowSize + 3)) && + (event->y() > (int)(y - (default_row_height_ / 2))) && + (event->y() <= (int)(y + (default_row_height_ / 2)))) { + + if (r.expanded) { + r.collapsing = true; + r.expanded = false; + r.anim_shape = ArrowSize; + } else { + r.expanding = true; + r.anim_shape = 0; + } + + r.animation_step = 0; + r.anim_height = r.height; + 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) @@ -681,7 +772,7 @@ 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 = max(ann_start, pp.left() + row_title_width); + const int real_start = max(ann_start, pp.left() + ArrowSize + row_title_width); const int real_end = min(ann_end, pp.right()); const int real_width = real_end - real_start; @@ -892,58 +983,6 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) QString() : annotations[0].annotations().front(); } -void DecodeTrace::hover_point_changed(const QPoint &hp) -{ - Trace::hover_point_changed(hp); - - assert(owner_); - - RowData* hover_row = get_row_at_point(hp); - - // Row expansion marker handling - for (RowData& r : rows_) - r.expand_marker_highlighted = false; - - if (hover_row) { - int row_y = get_row_y(hover_row); - if ((hp.x() > 0) && (hp.x() < ArrowSize) && - (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) - hover_row->expand_marker_highlighted = true; - } - - // Tooltip handling - if (hp.x() > 0) { - QString ann = get_annotation_at_point(hp); - - if (!ann.isEmpty()) { - QFontMetrics m(QToolTip::font()); - const QRect text_size = m.boundingRect(QRect(), 0, ann); - - // This is OS-specific and unfortunately we can't query it, so - // use an approximation to at least try to minimize the error. - const int padding = default_row_height_ + 8; - - // Make sure the tool tip doesn't overlap with the mouse cursor. - // If it did, the tool tip would constantly hide and re-appear. - // We also push it up by one row so that it appears above the - // decode trace, not below. - QPoint p = hp; - p.setX(hp.x() - (text_size.width() / 2) - padding); - - p.setY(get_row_y(hover_row) - default_row_height_ - - text_size.height() - padding); - - const View *const view = owner_->view(); - assert(view); - QToolTip::showText(view->viewport()->mapToGlobal(p), ann); - - } else - QToolTip::hideText(); - - } else - QToolTip::hideText(); -} - void DecodeTrace::create_decoder_form(int index, shared_ptr &dec, QWidget *parent, QFormLayout *form) @@ -1142,9 +1181,13 @@ void DecodeTrace::update_rows() RowData nr; nr.decode_row = decode_row; nr.height = default_row_height_; + nr.expanded_height = 5*default_row_height_; nr.currently_visible = false; nr.expand_marker_highlighted = false; + nr.expanding = false; nr.expanded = false; + nr.collapsing = false; + nr.expand_marker_shape = default_marker_shape_; rows_.push_back(nr); r = &rows_.back(); @@ -1216,11 +1259,6 @@ void DecodeTrace::on_pause_decode() decode_signal_->pause_decode(); } -void DecodeTrace::delete_pressed() -{ - on_delete(); -} - void DecodeTrace::on_delete() { session_.remove_decode_signal(decode_signal_); @@ -1418,6 +1456,59 @@ void DecodeTrace::on_export_all_rows_from_here() delete annotations; } +void DecodeTrace::on_animation_timer() +{ + bool animation_finished = true; + + for (RowData& r : rows_) { + if (!(r.expanding || r.collapsing)) + continue; + + unsigned int height_delta = r.expanded_height - default_row_height_; + + if (r.expanding) { + if (r.height < r.expanded_height) { + r.anim_height += height_delta / (float)AnimationDurationInTicks; + r.height = r.anim_height; + r.anim_shape += ArrowSize / (float)AnimationDurationInTicks; + animation_finished = false; + } else { + r.height = std::min(r.height, r.expanded_height); + r.expanding = false; + r.expanded = true; + } + } + + if (r.collapsing) { + if (r.height > default_row_height_) { + r.anim_height -= height_delta / (float)AnimationDurationInTicks; + r.height = r.anim_height; + r.anim_shape -= ArrowSize / (float)AnimationDurationInTicks; + animation_finished = false; + } else { + r.height = std::max(r.height, default_row_height_); + r.collapsing = false; + r.expanded = false; + r.expand_marker_shape = default_marker_shape_; + } + } + + // The expansion marker shape switches between + // 0/-A, A/0, 0/A (default state; anim_shape=0) and + // 0/ 0, A/A, 2A/0 (expanded state; anim_shape=ArrowSize) + + r.expand_marker_shape.setPoint(0, 0, -ArrowSize + r.anim_shape); + r.expand_marker_shape.setPoint(1, ArrowSize, r.anim_shape); + r.expand_marker_shape.setPoint(2, 2*r.anim_shape, ArrowSize - r.anim_shape); + } + + if (animation_finished) + animation_timer_.stop(); + + if (owner_) + 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 75bea06c..79f7a27d 100644 --- a/pv/views/trace/decodetrace.hpp +++ b/pv/views/trace/decodetrace.hpp @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -75,8 +76,11 @@ struct RowData { // DecodeTrace::update_rows() data::decode::Row decode_row; - unsigned int height, title_width; - bool exists, currently_visible, expand_marker_highlighted, expanded; + unsigned int height, expanded_height, title_width, animation_step; + bool exists, currently_visible; + bool expand_marker_highlighted, expanding, expanded, collapsing; + QPolygon expand_marker_shape; + float anim_height, anim_shape; }; class DecodeTrace : public Trace @@ -93,6 +97,7 @@ private: static const int DrawPadding; static const int MaxTraceUpdateRate; + static const unsigned int AnimationDurationInTicks; public: DecodeTrace(pv::Session &session, shared_ptr signalbase, @@ -137,7 +142,11 @@ public: virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos); - void delete_pressed(); + virtual void delete_pressed(); + + virtual void hover_point_changed(const QPoint &hp); + + virtual void mouse_left_press_event(const QMouseEvent* event); private: void draw_annotations(vector annotations, @@ -200,9 +209,6 @@ private: void update_rows(); -public: - virtual void hover_point_changed(const QPoint &hp); - private Q_SLOTS: void on_setting_changed(const QString &key, const QVariant &value); @@ -235,6 +241,8 @@ private Q_SLOTS: void on_export_row_from_here(); void on_export_all_rows_from_here(); + void on_animation_timer(); + private: pv::Session &session_; shared_ptr decode_signal_; @@ -260,7 +268,9 @@ private: QSignalMapper delete_mapper_, show_hide_mapper_; - QTimer delayed_trace_updater_; + QTimer delayed_trace_updater_, animation_timer_; + + QPolygon default_marker_shape_; }; } // namespace trace diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index d2e90060..e72770f0 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -1382,6 +1382,7 @@ void View::determine_time_unit() bool View::eventFilter(QObject *object, QEvent *event) { const QEvent::Type type = event->type(); + if (type == QEvent::MouseMove) { if (object) @@ -1399,6 +1400,15 @@ bool View::eventFilter(QObject *object, QEvent *event) update_hover_point(); + } else if (type == QEvent::MouseButtonPress) { + const QMouseEvent *const mouse_event = (QMouseEvent*)event; + if ((object == viewport_) && (mouse_event->button() & Qt::LeftButton)) { + // Send event to all trace tree items + const vector> trace_tree_items( + list_by_type()); + for (const shared_ptr& r : trace_tree_items) + r->mouse_left_press_event(mouse_event); + } } else if (type == QEvent::Leave) { hover_point_ = QPoint(-1, -1); update_hover_point(); diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp index fdd40176..7fe2bf72 100644 --- a/pv/views/trace/view.hpp +++ b/pv/views/trace/view.hpp @@ -147,7 +147,6 @@ public: virtual const View* view() const; Viewport* viewport(); - const Viewport* viewport() const; const Ruler* ruler() const; diff --git a/pv/views/trace/viewitem.cpp b/pv/views/trace/viewitem.cpp index 2a3a6926..f84080ec 100644 --- a/pv/views/trace/viewitem.cpp +++ b/pv/views/trace/viewitem.cpp @@ -153,6 +153,11 @@ void ViewItem::hover_point_changed(const QPoint &hp) (void)hp; } +void ViewItem::mouse_left_press_event(const QMouseEvent* event) +{ + (void)event; +} + } // namespace trace } // namespace views } // namespace pv diff --git a/pv/views/trace/viewitem.hpp b/pv/views/trace/viewitem.hpp index c445f609..423e75d2 100644 --- a/pv/views/trace/viewitem.hpp +++ b/pv/views/trace/viewitem.hpp @@ -22,6 +22,7 @@ #include +#include #include #include @@ -169,6 +170,12 @@ public: virtual void hover_point_changed(const QPoint &hp); + /** + * Handles left mouse button press events. + * @param event the mouse event that triggered this handler. + */ + virtual void mouse_left_press_event(const QMouseEvent* event); + protected: static QPen highlight_pen(); diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp index 9621f351..d3111dc7 100644 --- a/pv/views/viewbase.hpp +++ b/pv/views/viewbase.hpp @@ -66,7 +66,7 @@ class ViewBase : public QWidget { Q_OBJECT -private: +public: static const int MaxViewAutoUpdateRate; public: -- 2.30.2