When hovering a ViewItem only change the mouse cursor for movable items.

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2772c7764ead3a45b2c76733be6b0fe98d252c05..3811c1e8a143d70b6dc8f03115d1ead1e529c07e 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -35,6 +35,7 @@
 using std::abs;
 using std::back_inserter;
 using std::copy;
+using std::dynamic_pointer_cast;
 using std::max;
 using std::min;
 using std::none_of;
@@ -48,7 +49,6 @@ namespace view {
 
 Viewport::Viewport(View &parent) :
        ViewWidget(parent),
-       drag_offset_(numeric_limits<double>::signaling_NaN()),
        pinch_zoom_active_(false)
 {
        setAutoFillBackground(true);
@@ -57,14 +57,24 @@ Viewport::Viewport(View &parent) :
 
 shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 {
+       const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
        const vector< shared_ptr<ViewItem> > items(this->items());
        for (auto i = items.rbegin(); i != items.rend(); i++)
                if ((*i)->enabled() &&
-                       (*i)->hit_box_rect(rect()).contains(pt))
+                       (*i)->hit_box_rect(pp).contains(pt))
                        return *i;
        return nullptr;
 }
 
+void Viewport::item_hover(const shared_ptr<ViewItem> &item)
+{
+       if (item && item->is_draggable())
+               setCursor(dynamic_pointer_cast<RowItem>(item) ?
+                       Qt::SizeVerCursor : Qt::SizeHorCursor);
+       else
+               unsetCursor();
+}
+
 void Viewport::drag()
 {
        drag_offset_ = view_.offset();
@@ -72,21 +82,24 @@ void Viewport::drag()
 
 void Viewport::drag_by(const QPoint &delta)
 {
-       if (isnan(drag_offset_))
+       if (drag_offset_ == boost::none)
                return;
 
-       view_.set_scale_offset(view_.scale(), drag_offset_ -
-               delta.x() * view_.scale());
+       view_.set_scale_offset(view_.scale(),
+               (*drag_offset_ - delta.x() * view_.scale()));
 }
 
 void Viewport::drag_release()
 {
-       drag_offset_ = numeric_limits<double>::signaling_NaN();
+       drag_offset_ = boost::none;
 }
 
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
-       vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+       vector< shared_ptr<ViewItem> > items;
+       const std::vector< shared_ptr<ViewItem> > view_items(
+               view_.list_by_type<ViewItem>());
+       copy(view_items.begin(), view_items.end(), back_inserter(items));
        const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
        copy(time_items.begin(), time_items.end(), back_inserter(items));
        return items;
@@ -106,8 +119,8 @@ bool Viewport::touch_event(QTouchEvent *event)
 
        if (!pinch_zoom_active_ ||
            (event->touchPointStates() & Qt::TouchPointPressed)) {
-               pinch_offset0_ = view_.offset() + view_.scale() * touchPoint0.pos().x();
-               pinch_offset1_ = view_.offset() + view_.scale() * touchPoint1.pos().x();
+               pinch_offset0_ = (view_.offset() + view_.scale() * touchPoint0.pos().x()).convert_to<double>();
+               pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to<double>();
                pinch_zoom_active_ = true;
        }
 
@@ -139,13 +152,13 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-       vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+       vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
        assert(none_of(row_items.begin(), row_items.end(),
                [](const shared_ptr<RowItem> &r) { return !r; }));
 
        stable_sort(row_items.begin(), row_items.end(),
                [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-                       return a->visual_v_offset() < b->visual_v_offset(); });
+                       return a->point(QRect()).y() < b->point(QRect()).y(); });
 
        const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
        assert(none_of(time_items.begin(), time_items.end(),
@@ -168,6 +181,8 @@ void Viewport::paintEvent(QPaintEvent*)
 
        for (const shared_ptr<RowItem> r : row_items)
                r->paint_fore(p, pp);
+
+       p.setRenderHint(QPainter::Antialiasing, false);
        for (const shared_ptr<TimeItem> t : time_items)
                t->paint_fore(p, pp);
 
@@ -184,18 +199,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
                view_.zoom(-2.0, event->x());
 }
 
-void Viewport::wheelEvent(QWheelEvent *event)
+void Viewport::wheelEvent(QWheelEvent *e)
 {
-       assert(event);
-
-       if (event->orientation() == Qt::Vertical) {
-               // Vertical scrolling is interpreted as zooming in/out
-               view_.zoom(event->delta() / 120, event->x());
-       } else if (event->orientation() == Qt::Horizontal) {
+       assert(e);
+
+       if (e->orientation() == Qt::Vertical)
+       {
+               if (e->modifiers() & Qt::ControlModifier) {
+                       // Vertical scrolling with the control key pressed
+                       // is intrepretted as vertical scrolling
+                       view_.set_v_offset(-view_.owner_visual_v_offset() -
+                               (e->delta() * height()) / (8 * 120));
+               } else {
+                       // Vertical scrolling is interpreted as zooming in/out
+                       view_.zoom(e->delta() / 120, e->x());
+               }
+       }
+       else if (e->orientation() == Qt::Horizontal)
+       {
                // Horizontal scrolling is interpreted as moving left/right
                view_.set_scale_offset(view_.scale(),
-                                      event->delta() * view_.scale()
-                                      + view_.offset());
+                       e->delta() * view_.scale() + view_.offset());
        }
 }