X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=6e07a2a8baa48a7ba0f0286e867235aad701873c;hp=0e89f3ad96fc6b983d3ed1d9d8fe2cb495e59f2b;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=1c91f1a230ac7f61ad0c2ed9718d12514353b629 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 0e89f3ad..6e07a2a8 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); @@ -55,17 +57,52 @@ Viewport::Viewport(View &parent) : shared_ptr Viewport::get_mouse_over_item(const QPoint &pt) { + const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset()); const vector< shared_ptr > 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 &item) +{ + if (item && item->is_draggable()) + setCursor(dynamic_pointer_cast(item) ? + Qt::SizeVerCursor : Qt::SizeHorCursor); + else + unsetCursor(); +} + +void Viewport::drag() +{ + drag_offset_ = view_.offset(); + drag_v_offset_ = view_.owner_visual_v_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())); + + view_.set_v_offset(-drag_v_offset_ - delta.y()); +} + +void Viewport::drag_release() +{ + drag_offset_ = boost::none; +} + vector< shared_ptr > Viewport::items() { - vector< shared_ptr > items(view_.begin(), view_.end()); + vector< shared_ptr > items; + const std::vector< shared_ptr > view_items( + view_.list_by_type()); + copy(view_items.begin(), view_items.end(), back_inserter(items)); const vector< shared_ptr > time_items(view_.time_items()); copy(time_items.begin(), time_items.end(), back_inserter(items)); return items; @@ -85,8 +122,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(); + pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to(); pinch_zoom_active_ = true; } @@ -104,13 +141,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(); } } @@ -119,13 +155,13 @@ 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_.list_by_type()); assert(none_of(row_items.begin(), row_items.end(), [](const shared_ptr &r) { return !r; })); stable_sort(row_items.begin(), row_items.end(), [](const shared_ptr &a, const shared_ptr &b) { - return a->visual_v_offset() < b->visual_v_offset(); }); + return a->point(QRect()).y() < b->point(QRect()).y(); }); const vector< shared_ptr > time_items(view_.time_items()); assert(none_of(time_items.begin(), time_items.end(), @@ -148,49 +184,14 @@ void Viewport::paintEvent(QPaintEvent*) for (const shared_ptr r : row_items) r->paint_fore(p, pp); + + p.setRenderHint(QPainter::Antialiasing, false); for (const shared_ptr t : time_items) t->paint_fore(p, pp); 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); @@ -206,13 +207,19 @@ void Viewport::wheelEvent(QWheelEvent *event) assert(event); if (event->orientation() == Qt::Vertical) { - // Vertical scrolling is interpreted as zooming in/out - view_.zoom(event->delta() / 120, event->x()); + if (event->modifiers() & Qt::ControlModifier) { + // Vertical scrolling with the control key pressed + // is intrepretted as vertical scrolling + view_.set_v_offset(-view_.owner_visual_v_offset() - + (event->delta() * height()) / (8 * 120)); + } else { + // 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()); + event->delta() * view_.scale() + view_.offset()); } }