Fixes

[pulseview.git] / pv / views / trace / viewwidget.cpp

diff --git a/pv/views/trace/viewwidget.cpp b/pv/views/trace/viewwidget.cpp
index a14c4fd224395eb95bc8c46d97766051a7ec0e51..499471b91001bf3488d4b893cac0591548b7ad07 100644 (file)
--- a/pv/views/trace/viewwidget.cpp
+++ b/pv/views/trace/viewwidget.cpp
@@ -50,9 +50,10 @@ void ViewWidget::clear_selection()
                i->select(false);
 }
 
                i->select(false);
 }
 

-void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item, QPoint pos)

 {
        (void)item;
 {
        (void)item;

+       (void)pos;

 }
 
 void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
 }
 
 void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)


@@ -76,7 +77,7 @@ bool ViewWidget::accept_drag() const
        if (any_row_items_selected && !any_time_items_selected) {
                // Check all the drag items share a common owner
                TraceTreeItemOwner *item_owner = nullptr;
        if (any_row_items_selected && !any_time_items_selected) {
                // Check all the drag items share a common owner
                TraceTreeItemOwner *item_owner = nullptr;

-               for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+               for (const shared_ptr<TraceTreeItem>& r : trace_tree_items)

                        if (r->dragging()) {
                                if (!item_owner)
                                        item_owner = r->owner();
                        if (r->dragging()) {
                                if (!item_owner)
                                        item_owner = r->owner();


@@ -104,9 +105,9 @@ void ViewWidget::drag_items(const QPoint &delta)
        bool item_dragged = false;
 
        // Drag the row items
        bool item_dragged = false;
 
        // Drag the row items

-       const vector< shared_ptr<RowItem> > row_items(
-               view_.list_by_type<RowItem>());
-       for (shared_ptr<RowItem> r : row_items)
+       const vector< shared_ptr<ViewItem> > row_items(
+               view_.list_by_type<ViewItem>());
+       for (const shared_ptr<ViewItem>& r : row_items)

                if (r->dragging()) {
                        r->drag_by(delta);
 
                if (r->dragging()) {
                        r->drag_by(delta);
 


@@ -120,7 +121,7 @@ void ViewWidget::drag_items(const QPoint &delta)
        TraceTreeItemOwner *item_owner = nullptr;
        const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
                view_.list_by_type<TraceTreeItem>());
        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)
+       for (const shared_ptr<TraceTreeItem>& i : trace_tree_items)

                if (i->dragging())
                        item_owner = i->owner();
 
                if (i->dragging())
                        item_owner = i->owner();
 


@@ -180,7 +181,7 @@ void ViewWidget::mouse_left_press_event(QMouseEvent *event)
        bool item_dragged = false;
        const auto items = this->items();
        for (auto &i : items)
        bool item_dragged = false;
        const auto items = this->items();
        for (auto &i : items)

-               if (i->selected()) {
+               if (i->selected() && i->is_draggable(event->pos())) {

                        item_dragged = true;
                        i->drag();
                }
                        item_dragged = true;
                        i->drag();
                }


@@ -251,17 +252,25 @@ void ViewWidget::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
 
 {
        assert(event);
 

-       /* Ignore right click events as they will open context menus when
+       if (event->button() & Qt::LeftButton) {
+               if (event->modifiers() & Qt::ShiftModifier)
+                       view_.show_cursors(false);
+
+               mouse_down_point_ = event->pos();
+               mouse_down_offset_ = view_.offset() + event->pos().x() * view_.scale();
+               mouse_down_item_ = get_mouse_over_item(event->pos());
+               mouse_left_press_event(event);
+       }
+
+       /* Don't forward right click events as they will open context menus when

         * used on trace labels. Those menus prevent ViewWidget::mouseReleaseEvent()
         * to be triggered upon button release, making mouse_down_item_
         * hold the last reference to a view item that might have been deleted
         * from the context menu, preventing it from being freed as intended.
         * used on trace labels. Those menus prevent ViewWidget::mouseReleaseEvent()
         * to be triggered upon button release, making mouse_down_item_
         * hold the last reference to a view item that might have been deleted
         * from the context menu, preventing it from being freed as intended.

+        * TODO Remove this once context menus are handled separately

         */
         */

-       if (event->button() & Qt::LeftButton) {
+       if (event->button() & Qt::RightButton)

                mouse_down_point_ = event->pos();
                mouse_down_point_ = event->pos();

-               mouse_down_item_ = get_mouse_over_item(event->pos());
-               mouse_left_press_event(event);
-       }

 }
 
 void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 }
 
 void ViewWidget::mouseReleaseEvent(QMouseEvent *event)


@@ -281,21 +290,37 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event)
        mouse_point_ = event->pos();
 
        if (!event->buttons())
        mouse_point_ = event->pos();
 
        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;
+               item_hover(get_mouse_over_item(event->pos()), event->pos());

 
 

-                       if (!accept_drag())
-                               return;
+       if (event->buttons() & Qt::LeftButton) {
+               if (event->modifiers() & Qt::ShiftModifier) {
+                       // Cursor drag
+                       pv::util::Timestamp current_offset = view_.offset() + event->pos().x() * view_.scale();

 
 

-                       item_dragging_ = true;
-               }
+                       const int drag_distance = qAbs(current_offset.convert_to<double>() -
+                               mouse_down_offset_.convert_to<double>()) / view_.scale();
+
+                       if (drag_distance > QApplication::startDragDistance()) {
+                               view_.show_cursors(true);
+                               view_.set_cursors(mouse_down_offset_, current_offset);
+                       } else
+                               view_.show_cursors(false);
+
+               } else {
+                       if (!item_dragging_) {
+                               if ((event->pos() - mouse_down_point_).manhattanLength() <
+                                       QApplication::startDragDistance())
+                                       return;

 
 

-               // Do the drag
-               drag_items(event->pos() - mouse_down_point_);
+                               if (!accept_drag())
+                                       return;
+
+                               item_dragging_ = true;
+                       }
+
+                       // Do the drag
+                       drag_items(event->pos() - mouse_down_point_);
+               }

        }
 }
 
        }
 }