Standardize on 'event' as name for all Qt events.

[pulseview.git] / pv / view / viewwidget.cpp

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 816fbf513db042fa48dd6edd48fe7c68bd869453..79326d2a10a06742a3a2639a6cbd88376d06a704 100644 (file)
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -22,7 +22,7 @@
 #include <QMouseEvent>
 #include <QTouchEvent>
 
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
 #include "view.hpp"
 #include "viewwidget.hpp"
 
@@ -48,7 +48,11 @@ void ViewWidget::clear_selection()
        const auto items = this->items();
        for (auto &i : items)
                i->select(false);
-       update();
+}
+
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+{
+       (void)item;
 }
 
 void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
@@ -59,33 +63,34 @@ void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
 bool ViewWidget::accept_drag() const
 {
        const vector< shared_ptr<TimeItem> > items(view_.time_items());
+       const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+               view_.list_by_type<TraceTreeItem>());
 
-       const bool any_row_items_selected = any_of(view_.begin(), view_.end(),
-               [](const shared_ptr<RowItem> &r) { return r->selected(); });
+       const bool any_row_items_selected = any_of(
+               trace_tree_items.begin(), trace_tree_items.end(),
+               [](const shared_ptr<TraceTreeItem> &r) { return r->selected(); });
 
        const bool any_time_items_selected = any_of(items.begin(), items.end(),
                [](const shared_ptr<TimeItem> &i) { return i->selected(); });
 
-       if (any_row_items_selected && !any_time_items_selected)
-       {
+       if (any_row_items_selected && !any_time_items_selected) {
                // Check all the drag items share a common owner
-               RowItemOwner *item_owner = nullptr;
-               for (shared_ptr<RowItem> r : view_)
+               TraceTreeItemOwner *item_owner = nullptr;
+               for (shared_ptr<TraceTreeItem> r : trace_tree_items)
                        if (r->dragging()) {
                                if (!item_owner)
                                        item_owner = r->owner();
-                               else if(item_owner != r->owner())
+                               else if (item_owner != r->owner())
                                        return false;
                        }
 
                return true;
-       }
-       else if (any_time_items_selected && !any_row_items_selected)
-       {
+       } else if (any_time_items_selected && !any_row_items_selected) {
                return true;
        }
 
-       return false;
+       // A background drag is beginning
+       return true;
 }
 
 bool ViewWidget::mouse_down() const
@@ -96,28 +101,59 @@ bool ViewWidget::mouse_down() const
 
 void ViewWidget::drag_items(const QPoint &delta)
 {
+       bool item_dragged = false;
+
        // Drag the row items
-       RowItemOwner *item_owner = nullptr;
-       for (std::shared_ptr<RowItem> r : view_)
+       const vector< shared_ptr<RowItem> > row_items(
+               view_.list_by_type<RowItem>());
+       for (shared_ptr<RowItem> r : row_items)
                if (r->dragging()) {
-                       item_owner = r->owner();
                        r->drag_by(delta);
 
                        // Ensure the trace is selected
                        r->select();
+
+                       item_dragged = true;
                }
 
+       // If an item is being dragged, update the stacking
+       TraceTreeItemOwner *item_owner = nullptr;
+       const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+               view_.list_by_type<TraceTreeItem>());
+       for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+               if (i->dragging())
+                       item_owner = i->owner();
+
        if (item_owner) {
                item_owner->restack_items();
-               for (const auto &r : *item_owner)
-                       r->animate_to_layout_v_offset();
+               for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+                       i->animate_to_layout_v_offset();
        }
 
        // Drag the time items
        const vector< shared_ptr<TimeItem> > items(view_.time_items());
        for (auto &i : items)
-               if (i->dragging())
+               if (i->dragging()) {
                        i->drag_by(delta);
+                       item_dragged = true;
+               }
+
+       // Do the background drag
+       if (!item_dragged)
+               drag_by(delta);
+}
+
+void ViewWidget::drag()
+{
+}
+
+void ViewWidget::drag_by(const QPoint &delta)
+{
+       (void)delta;
+}
+
+void ViewWidget::drag_release()
+{
 }
 
 void ViewWidget::mouse_left_press_event(QMouseEvent *event)
@@ -141,13 +177,19 @@ void ViewWidget::mouse_left_press_event(QMouseEvent *event)
        }
 
        // Save the offsets of any signals which will be dragged
+       bool item_dragged = false;
        const auto items = this->items();
        for (auto &i : items)
-               if (i->selected())
+               if (i->selected()) {
+                       item_dragged = true;
                        i->drag();
+               }
+
+       // Do the background drag
+       if (!item_dragged)
+               drag();
 
        selection_changed();
-       update();
 }
 
 void ViewWidget::mouse_left_release_event(QMouseEvent *event)
@@ -166,9 +208,8 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
                i->drag_release();
 
        if (item_dragging_)
-               view_.restack_all_row_items();
-       else
-       {
+               view_.restack_all_trace_tree_items();
+       else {
                if (!ctrl_pressed) {
                        for (shared_ptr<ViewItem> i : items)
                                if (mouse_down_item_ != i)
@@ -182,9 +223,10 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
        item_dragging_ = false;
 }
 
-bool ViewWidget::touch_event(QTouchEvent *e)
+bool ViewWidget::touch_event(QTouchEvent *event)
 {
-       (void)e;
+       (void)event;
+
        return false;
 }
 
@@ -231,21 +273,23 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event)
        assert(event);
        mouse_point_ = event->pos();
 
-       if (!(event->buttons() & Qt::LeftButton))
-               return;
+       if (!event->buttons())
+               item_hover(get_mouse_over_item(event->pos()));
+       else if (event->buttons() & Qt::LeftButton) {
+               if (!item_dragging_) {
+                       if ((event->pos() - mouse_down_point_).manhattanLength() <
+                               QApplication::startDragDistance())
+                               return;
 
-       if ((event->pos() - mouse_down_point_).manhattanLength() <
-               QApplication::startDragDistance())
-               return;
+                       if (!accept_drag())
+                               return;
 
-       if (!accept_drag())
-               return;
-
-       // Do the drag
-       item_dragging_ = true;
-       drag_items(event->pos() - mouse_down_point_);
+                       item_dragging_ = true;
+               }
 
-       update();
+               // Do the drag
+               drag_items(event->pos() - mouse_down_point_);
+       }
 }
 
 void ViewWidget::leaveEvent(QEvent*)