TraceTreeItem: Separated from RowItem

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

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 0b3b2fd1e233f962bc9f6b50417109e72582722b..9913b5cc1640550a5cf563849a1c0a361a3f5cb2 100644 (file)
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -20,8 +20,9 @@
 
 #include <QApplication>
 #include <QMouseEvent>
+#include <QTouchEvent>
 
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
 #include "view.hpp"
 #include "viewwidget.hpp"
 
@@ -35,9 +36,10 @@ namespace view {
 ViewWidget::ViewWidget(View &parent) :
        QWidget(&parent),
        view_(parent),
-       dragging_(false)
+       item_dragging_(false)
 {
        setFocusPolicy(Qt::ClickFocus);
+       setAttribute(Qt::WA_AcceptTouchEvents, true);
        setMouseTracking(true);
 }
 
@@ -49,6 +51,11 @@ void ViewWidget::clear_selection()
        update();
 }
 
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+{
+       (void)item;
+}
+
 void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
 {
        (void)item;
@@ -59,7 +66,7 @@ bool ViewWidget::accept_drag() const
        const vector< shared_ptr<TimeItem> > items(view_.time_items());
 
        const bool any_row_items_selected = any_of(view_.begin(), view_.end(),
-               [](const shared_ptr<RowItem> &r) { return r->selected(); });
+               [](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(); });
@@ -67,12 +74,12 @@ bool ViewWidget::accept_drag() const
        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 : view_)
                        if (r->dragging()) {
                                if (!item_owner)
                                        item_owner = r->owner();
-                               else if(item_owner != r->owner())
+                               else if (item_owner != r->owner())
                                        return false;
                        }
 
@@ -83,14 +90,23 @@ bool ViewWidget::accept_drag() const
                return true;
        }
 
-       return false;
+       // A background drag is beginning
+       return true;
+}
+
+bool ViewWidget::mouse_down() const
+{
+       return mouse_down_point_.x() != INT_MIN &&
+               mouse_down_point_.y() != INT_MIN;
 }
 
 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_)
+       TraceTreeItemOwner *item_owner = nullptr;
+       for (std::shared_ptr<TraceTreeItem> r : view_)
                if (r->dragging()) {
                        item_owner = r->owner();
                        r->drag_by(delta);
@@ -100,6 +116,7 @@ void ViewWidget::drag_items(const QPoint &delta)
                }
 
        if (item_owner) {
+               item_dragged = true;
                item_owner->restack_items();
                for (const auto &r : *item_owner)
                        r->animate_to_layout_v_offset();
@@ -108,8 +125,27 @@ void ViewWidget::drag_items(const QPoint &delta)
        // 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)
@@ -133,10 +169,17 @@ 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();
@@ -157,8 +200,8 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
        for (auto &i : items)
                i->drag_release();
 
-       if (dragging_)
-               view_.restack_all_row_items();
+       if (item_dragging_)
+               view_.restack_all_trace_tree_items();
        else
        {
                if (!ctrl_pressed) {
@@ -171,7 +214,30 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
                }
        }
 
-       dragging_ = false;
+       item_dragging_ = false;
+}
+
+bool ViewWidget::touch_event(QTouchEvent *e)
+{
+       (void)e;
+       return false;
+}
+
+bool ViewWidget::event(QEvent *event)
+{
+       switch (event->type()) {
+       case QEvent::TouchBegin:
+       case QEvent::TouchUpdate:
+       case QEvent::TouchEnd:
+               if (touch_event(static_cast<QTouchEvent *>(event)))
+                       return true;
+               break;
+
+       default:
+               break;
+       }
+
+       return QWidget::event(event);
 }
 
 void ViewWidget::mousePressEvent(QMouseEvent *event)
@@ -191,29 +257,36 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
        if (event->button() & Qt::LeftButton)
                mouse_left_release_event(event);
 
+       mouse_down_point_ = QPoint(INT_MIN, INT_MIN);
        mouse_down_item_ = nullptr;
 }
 
-void ViewWidget::mouseMoveEvent(QMouseEvent *event)
+void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 {
-       assert(event);
-       mouse_point_ = event->pos();
+       assert(e);
+       mouse_point_ = e->pos();
 
-       if (!(event->buttons() & Qt::LeftButton))
-               return;
+       if (!e->buttons())
+               item_hover(get_mouse_over_item(e->pos()));
+       else if (e->buttons() & Qt::LeftButton)
+       {
+               if (!item_dragging_)
+               {
+                       if ((e->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;
+                       item_dragging_ = true;
+               }
 
-       // Do the drag
-       dragging_ = true;
-       drag_items(event->pos() - mouse_down_point_);
+               // Do the drag
+               drag_items(e->pos() - mouse_down_point_);
 
-       update();
+               update();
+       }
 }
 
 void ViewWidget::leaveEvent(QEvent*)