X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=007a8c218878fa14cf0477322b7557296a990a14;hp=971eb755228f978a1355677adbfb9d6f5668615d;hb=af503b104d890a357c736c678bb00296d889c090;hpb=c9743553584975b338890c16ef22943d7beaacdd diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 971eb755..007a8c21 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,7 +49,6 @@ namespace view { Viewport::Viewport(View &parent) : ViewWidget(parent), - mouse_down_valid_(false), pinch_zoom_active_(false) { setAutoFillBackground(true); @@ -63,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()); @@ -85,16 +115,15 @@ 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(); + 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) { - double scale = (pinch_offset1_ - pinch_offset0_) / w; - if (scale < 0) - scale = -scale; + 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); @@ -105,13 +134,12 @@ bool Viewport::touch_event(QTouchEvent *event) if (touchPoint0.state() & Qt::TouchPointReleased) { // Primary touch released - mouse_down_valid_ = false; + 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(); - mouse_down_offset_ = view_.offset(); - mouse_down_valid_ = true; + drag(); } } @@ -120,12 +148,12 @@ bool Viewport::touch_event(QTouchEvent *event) void Viewport::paintEvent(QPaintEvent*) { - vector< shared_ptr > row_items(view_.begin(), view_.end()); + vector< shared_ptr > row_items(view_.begin(), view_.end()); assert(none_of(row_items.begin(), row_items.end(), - [](const shared_ptr &r) { return !r; })); + [](const shared_ptr &r) { return !r; })); stable_sort(row_items.begin(), row_items.end(), - [](const shared_ptr &a, const shared_ptr &b) { + [](const shared_ptr &a, const shared_ptr &b) { return a->visual_v_offset() < b->visual_v_offset(); }); const vector< shared_ptr > time_items(view_.time_items()); @@ -139,15 +167,17 @@ void Viewport::paintEvent(QPaintEvent*) for (const shared_ptr t : time_items) t->paint_back(p, pp); - for (const shared_ptr r : row_items) + for (const shared_ptr r : row_items) r->paint_back(p, pp); for (const shared_ptr t : time_items) t->paint_mid(p, pp); - for (const shared_ptr r : row_items) + for (const shared_ptr r : row_items) r->paint_mid(p, pp); - for (const shared_ptr r : row_items) + p.setRenderHint(QPainter::Antialiasing, false); + + for (const shared_ptr r : row_items) r->paint_fore(p, pp); for (const shared_ptr t : time_items) t->paint_fore(p, pp); @@ -155,43 +185,6 @@ void Viewport::paintEvent(QPaintEvent*) p.end(); } -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); @@ -202,18 +195,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()); } }