Implement expansion marker animation and its infrastructure
authorSoeren Apel <soeren@apelpie.net>
Mon, 23 Dec 2019 10:55:46 +0000 (11:55 +0100)
committerSoeren Apel <soeren@apelpie.net>
Wed, 1 Jan 2020 12:15:21 +0000 (13:15 +0100)
pv/views/trace/decodetrace.cpp
pv/views/trace/decodetrace.hpp
pv/views/trace/view.cpp
pv/views/trace/view.hpp
pv/views/trace/viewitem.cpp
pv/views/trace/viewitem.hpp
pv/views/viewbase.hpp

index 8ea6f74453cdaee48146751821a77037bef6989b..61163bc2bdca727068f7384d0c455877ef5756fe 100644 (file)
@@ -86,12 +86,13 @@ namespace trace {
 const QColor DecodeTrace::ErrorBgColor = QColor(0xEF, 0x29, 0x29);
 const QColor DecodeTrace::NoDecodeColor = QColor(0x88, 0x8A, 0x85);
 
 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 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 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<data::SignalBase> signalbase, int index) :
 
 DecodeTrace::DecodeTrace(pv::Session &session,
        shared_ptr<data::SignalBase> 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);
                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()
 }
 
 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.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
                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));
 
 
                p.setBrush(QApplication::palette().brush(QPalette::WindowText));
 
@@ -484,6 +490,91 @@ QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos)
        return menu;
 }
 
        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<pv::data::decode::Annotation> annotations,
                QPainter &p, int h, const ViewItemPaintParams &pp, int y,
                QColor row_color, int row_title_width)
 void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> 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 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;
 
        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();
 }
 
                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<data::decode::Decoder> &dec, QWidget *parent,
        QFormLayout *form)
 void DecodeTrace::create_decoder_form(int index,
        shared_ptr<data::decode::Decoder> &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_;
                        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.currently_visible = false;
                        nr.expand_marker_highlighted = false;
+                       nr.expanding = false;
                        nr.expanded = false;
                        nr.expanded = false;
+                       nr.collapsing = false;
+                       nr.expand_marker_shape = default_marker_shape_;
 
                        rows_.push_back(nr);
                        r = &rows_.back();
 
                        rows_.push_back(nr);
                        r = &rows_.back();
@@ -1216,11 +1259,6 @@ void DecodeTrace::on_pause_decode()
                decode_signal_->pause_decode();
 }
 
                decode_signal_->pause_decode();
 }
 
-void DecodeTrace::delete_pressed()
-{
-       on_delete();
-}
-
 void DecodeTrace::on_delete()
 {
        session_.remove_decode_signal(decode_signal_);
 void DecodeTrace::on_delete()
 {
        session_.remove_decode_signal(decode_signal_);
@@ -1418,6 +1456,59 @@ void DecodeTrace::on_export_all_rows_from_here()
        delete annotations;
 }
 
        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
 } // namespace trace
 } // namespace views
 } // namespace pv
index 75bea06cdd81668582d6953007953e2c37d60c61..79f7a27d23b948bebf3c231de8df04c5042bfdd0 100644 (file)
@@ -29,6 +29,7 @@
 
 #include <QColor>
 #include <QComboBox>
 
 #include <QColor>
 #include <QComboBox>
+#include <QPolygon>
 #include <QPushButton>
 #include <QSignalMapper>
 #include <QTimer>
 #include <QPushButton>
 #include <QSignalMapper>
 #include <QTimer>
@@ -75,8 +76,11 @@ struct RowData {
        // DecodeTrace::update_rows()
 
        data::decode::Row decode_row;
        // 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
 };
 
 class DecodeTrace : public Trace
@@ -93,6 +97,7 @@ private:
        static const int DrawPadding;
 
        static const int MaxTraceUpdateRate;
        static const int DrawPadding;
 
        static const int MaxTraceUpdateRate;
+       static const unsigned int AnimationDurationInTicks;
 
 public:
        DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
 
 public:
        DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
@@ -137,7 +142,11 @@ public:
 
        virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
 
 
        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<pv::data::decode::Annotation> annotations,
 
 private:
        void draw_annotations(vector<pv::data::decode::Annotation> annotations,
@@ -200,9 +209,6 @@ private:
 
        void update_rows();
 
 
        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);
 
 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_export_row_from_here();
        void on_export_all_rows_from_here();
 
+       void on_animation_timer();
+
 private:
        pv::Session &session_;
        shared_ptr<data::DecodeSignal> decode_signal_;
 private:
        pv::Session &session_;
        shared_ptr<data::DecodeSignal> decode_signal_;
@@ -260,7 +268,9 @@ private:
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 
-       QTimer delayed_trace_updater_;
+       QTimer delayed_trace_updater_, animation_timer_;
+
+       QPolygon default_marker_shape_;
 };
 
 } // namespace trace
 };
 
 } // namespace trace
index d2e9006075d698f1af96b9ba8a77aa27df02d96f..e72770f07eabe7481f2f48b95a1cf0f86a15816d 100644 (file)
@@ -1382,6 +1382,7 @@ void View::determine_time_unit()
 bool View::eventFilter(QObject *object, QEvent *event)
 {
        const QEvent::Type type = event->type();
 bool View::eventFilter(QObject *object, QEvent *event)
 {
        const QEvent::Type type = event->type();
+
        if (type == QEvent::MouseMove) {
 
                if (object)
        if (type == QEvent::MouseMove) {
 
                if (object)
@@ -1399,6 +1400,15 @@ bool View::eventFilter(QObject *object, QEvent *event)
 
                update_hover_point();
 
 
                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<shared_ptr<TraceTreeItem>> trace_tree_items(
+                               list_by_type<TraceTreeItem>());
+                       for (const shared_ptr<TraceTreeItem>& r : trace_tree_items)
+                               r->mouse_left_press_event(mouse_event);
+               }
        } else if (type == QEvent::Leave) {
                hover_point_ = QPoint(-1, -1);
                update_hover_point();
        } else if (type == QEvent::Leave) {
                hover_point_ = QPoint(-1, -1);
                update_hover_point();
index fdd401764811570042bd42c4e9a19d13ce69e1c9..7fe2bf720181a04b3523efbed7f6e93b78c116a2 100644 (file)
@@ -147,7 +147,6 @@ public:
        virtual const View* view() const;
 
        Viewport* viewport();
        virtual const View* view() const;
 
        Viewport* viewport();
-
        const Viewport* viewport() const;
 
        const Ruler* ruler() const;
        const Viewport* viewport() const;
 
        const Ruler* ruler() const;
index 2a3a6926190fb00c0c5aac1b35b0f564c554727e..f84080ec79fe92c9207dd6d713135c4c15c3c9b9 100644 (file)
@@ -153,6 +153,11 @@ void ViewItem::hover_point_changed(const QPoint &hp)
        (void)hp;
 }
 
        (void)hp;
 }
 
+void ViewItem::mouse_left_press_event(const QMouseEvent* event)
+{
+       (void)event;
+}
+
 } // namespace trace
 } // namespace views
 } // namespace pv
 } // namespace trace
 } // namespace views
 } // namespace pv
index c445f609063df6386579d6fa6cebf74fd4a11c19..423e75d2f313e38ec7cd156831c1119edaea47f8 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <list>
 
 
 #include <list>
 
+#include <QMouseEvent>
 #include <QPen>
 #include <QPoint>
 
 #include <QPen>
 #include <QPoint>
 
@@ -169,6 +170,12 @@ public:
 
        virtual void hover_point_changed(const QPoint &hp);
 
 
        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();
 
 protected:
        static QPen highlight_pen();
 
index 9621f35117bd47a702eb9e397afa7e8a54fc9d7c..d3111dc79cdfbc5929f260d8f0181a2238f592a9 100644 (file)
@@ -66,7 +66,7 @@ class ViewBase : public QWidget
 {
        Q_OBJECT
 
 {
        Q_OBJECT
 
-private:
+public:
        static const int MaxViewAutoUpdateRate;
 
 public:
        static const int MaxViewAutoUpdateRate;
 
 public: