X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=79326d2a10a06742a3a2639a6cbd88376d06a704;hp=e2b2d17295f3295bc429f550548d95545c3ca1f3;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=1f1edc092680e9182be07a760ad03d00b8c5ca06 diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp index e2b2d172..79326d2a 100644 --- a/pv/view/viewwidget.cpp +++ b/pv/view/viewwidget.cpp @@ -20,8 +20,9 @@ #include #include +#include -#include "rowitem.hpp" +#include "tracetreeitem.hpp" #include "view.hpp" #include "viewwidget.hpp" @@ -38,6 +39,7 @@ ViewWidget::ViewWidget(View &parent) : item_dragging_(false) { setFocusPolicy(Qt::ClickFocus); + setAttribute(Qt::WA_AcceptTouchEvents, true); setMouseTracking(true); } @@ -46,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 &item) +{ + (void)item; } void ViewWidget::item_clicked(const shared_ptr &item) @@ -57,33 +63,34 @@ void ViewWidget::item_clicked(const shared_ptr &item) bool ViewWidget::accept_drag() const { const vector< shared_ptr > items(view_.time_items()); + const vector< shared_ptr > trace_tree_items( + view_.list_by_type()); - const bool any_row_items_selected = any_of(view_.begin(), view_.end(), - [](const shared_ptr &r) { return r->selected(); }); + const bool any_row_items_selected = any_of( + trace_tree_items.begin(), trace_tree_items.end(), + [](const shared_ptr &r) { return r->selected(); }); const bool any_time_items_selected = any_of(items.begin(), items.end(), [](const shared_ptr &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 r : view_) + TraceTreeItemOwner *item_owner = nullptr; + for (shared_ptr 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 @@ -94,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 r : view_) + const vector< shared_ptr > row_items( + view_.list_by_type()); + for (shared_ptr 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 > trace_tree_items( + view_.list_by_type()); + for (shared_ptr 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 i : trace_tree_items) + i->animate_to_layout_v_offset(); } // Drag the time items const vector< shared_ptr > 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) @@ -139,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) @@ -164,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 i : items) if (mouse_down_item_ != i) @@ -180,6 +223,30 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event) item_dragging_ = false; } +bool ViewWidget::touch_event(QTouchEvent *event) +{ + (void)event; + + return false; +} + +bool ViewWidget::event(QEvent *event) +{ + switch (event->type()) { + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: + if (touch_event(static_cast(event))) + return true; + break; + + default: + break; + } + + return QWidget::event(event); +} + void ViewWidget::mousePressEvent(QMouseEvent *event) { assert(event); @@ -206,21 +273,23 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event) assert(event); mouse_point_ = event->pos(); - if (!(event->buttons() & Qt::LeftButton)) - return; - - if ((event->pos() - mouse_down_point_).manhattanLength() < - QApplication::startDragDistance()) - 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 (!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*)