X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=a4b6680a7fe57bd02ed6b5b2e59888266a4d2552;hp=83df7aa4d1eaaa9543add3896e2b6363457ba200;hb=32c589f0f6a2218e81d4ee984335c4a88c79b35f;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 83df7aa4..a4b6680a 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "signal.hpp" #include "view.hpp" @@ -34,9 +35,11 @@ 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; +using std::numeric_limits; using std::shared_ptr; using std::stable_sort; using std::vector; @@ -46,11 +49,8 @@ namespace view { Viewport::Viewport(View &parent) : ViewWidget(parent), - mouse_down_valid_(false), pinch_zoom_active_(false) { - setAttribute(Qt::WA_AcceptTouchEvents, true); - setAutoFillBackground(true); setBackgroundRole(QPalette::Base); } @@ -65,6 +65,34 @@ shared_ptr Viewport::get_mouse_over_item(const QPoint &pt) return nullptr; } +void Viewport::item_hover(const shared_ptr &item) +{ + if (item) + setCursor(dynamic_pointer_cast(item) ? + Qt::SizeVerCursor : Qt::SizeHorCursor); + else + unsetCursor(); +} + +void Viewport::drag() +{ + drag_offset_ = view_.offset(); +} + +void Viewport::drag_by(const QPoint &delta) +{ + if (drag_offset_ == boost::none) + return; + + view_.set_scale_offset(view_.scale(), + (*drag_offset_ - delta.x() * view_.scale())); +} + +void Viewport::drag_release() +{ + drag_offset_ = boost::none; +} + vector< shared_ptr > Viewport::items() { vector< shared_ptr > items(view_.begin(), view_.end()); @@ -73,6 +101,51 @@ vector< shared_ptr > Viewport::items() return items; } +bool Viewport::touch_event(QTouchEvent *event) +{ + QList touchPoints = event->touchPoints(); + + if (touchPoints.count() != 2) { + pinch_zoom_active_ = false; + return false; + } + + const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); + const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); + + if (!pinch_zoom_active_ || + (event->touchPointStates() & Qt::TouchPointPressed)) { + pinch_offset0_ = (view_.offset() + view_.scale() * touchPoint0.pos().x()).convert_to(); + pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to(); + pinch_zoom_active_ = true; + } + + double w = touchPoint1.pos().x() - touchPoint0.pos().x(); + if (abs(w) >= 1.0) { + const double scale = + fabs((pinch_offset1_ - pinch_offset0_) / w); + double offset = pinch_offset0_ - touchPoint0.pos().x() * scale; + if (scale > 0) + view_.set_scale_offset(scale, offset); + } + + if (event->touchPointStates() & Qt::TouchPointReleased) { + pinch_zoom_active_ = false; + + if (touchPoint0.state() & Qt::TouchPointReleased) { + // Primary touch released + drag_release(); + } else { + // Update the mouse down fields so that continued + // dragging with the primary touch will work correctly + mouse_down_point_ = touchPoint0.pos().toPoint(); + drag(); + } + } + + return true; +} + void Viewport::paintEvent(QPaintEvent*) { vector< shared_ptr > row_items(view_.begin(), view_.end()); @@ -102,6 +175,8 @@ void Viewport::paintEvent(QPaintEvent*) for (const shared_ptr r : row_items) r->paint_mid(p, pp); + p.setRenderHint(QPainter::Antialiasing, false); + for (const shared_ptr r : row_items) r->paint_fore(p, pp); for (const shared_ptr t : time_items) @@ -110,60 +185,6 @@ void Viewport::paintEvent(QPaintEvent*) p.end(); } -bool Viewport::event(QEvent *event) -{ - switch (event->type()) { - case QEvent::TouchBegin: - case QEvent::TouchUpdate: - case QEvent::TouchEnd: - if (touchEvent(static_cast(event))) - return true; - break; - - default: - break; - } - - return QWidget::event(event); -} - -void Viewport::mousePressEvent(QMouseEvent *event) -{ - assert(event); - - if (event->button() == Qt::LeftButton) { - mouse_down_point_ = event->pos(); - mouse_down_offset_ = view_.offset(); - mouse_down_valid_ = true; - } -} - -void Viewport::mouseReleaseEvent(QMouseEvent *event) -{ - assert(event); - - if (event->button() == Qt::LeftButton) - mouse_down_valid_ = false; -} - -void Viewport::mouseMoveEvent(QMouseEvent *event) -{ - assert(event); - - if (event->buttons() & Qt::LeftButton) { - if (!mouse_down_valid_) { - mouse_down_point_ = event->pos(); - mouse_down_offset_ = view_.offset(); - mouse_down_valid_ = true; - } - - view_.set_scale_offset(view_.scale(), - mouse_down_offset_ + - (mouse_down_point_ - event->pos()).x() * - view_.scale()); - } -} - void Viewport::mouseDoubleClickEvent(QMouseEvent *event) { assert(event); @@ -174,66 +195,28 @@ 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) { - // Horizontal scrolling is interpreted as moving left/right - view_.set_scale_offset(view_.scale(), - event->delta() * view_.scale() - + view_.offset()); - } -} - -bool Viewport::touchEvent(QTouchEvent *event) -{ - QList touchPoints = event->touchPoints(); - - if (touchPoints.count() != 2) { - pinch_zoom_active_ = false; - return false; - } - - const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); - const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); - - 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_zoom_active_ = true; - } - - double w = touchPoint1.pos().x() - touchPoint0.pos().x(); - if (abs(w) >= 1.0) { - double scale = (pinch_offset1_ - pinch_offset0_) / w; - if (scale < 0) - scale = -scale; - double offset = pinch_offset0_ - touchPoint0.pos().x() * scale; - if (scale > 0) - view_.set_scale_offset(scale, offset); - } - - if (event->touchPointStates() & Qt::TouchPointReleased) { - pinch_zoom_active_ = false; - - if (touchPoint0.state() & Qt::TouchPointReleased) { - // Primary touch released - mouse_down_valid_ = false; + 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 { - // Update the mouse down fields so that continued - // dragging with the primary touch will work correctly - mouse_down_point_ = touchPoint0.pos().toPoint(); - mouse_down_offset_ = view_.offset(); - mouse_down_valid_ = true; + // Vertical scrolling is interpreted as zooming in/out + view_.zoom(e->delta() / 120, e->x()); } } - - return true; + else if (e->orientation() == Qt::Horizontal) + { + // Horizontal scrolling is interpreted as moving left/right + view_.set_scale_offset(view_.scale(), + e->delta() * view_.scale() + view_.offset()); + } } } // namespace view