X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=3811c1e8a143d70b6dc8f03115d1ead1e529c07e;hp=feb880e94a0bd0ea477ed225bdae4642c5cef767;hb=d75c5d12963b35bd8a8c507f565ec5c57fbdaac6;hpb=beb897c6c32c8e8dd9eb34d91100ab0569fca5f6 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index feb880e9..3811c1e8 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" @@ -32,9 +33,13 @@ #include 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; @@ -43,138 +48,64 @@ namespace pv { namespace view { Viewport::Viewport(View &parent) : - QWidget(&parent), - view_(parent), - mouse_down_valid_(false), + ViewWidget(parent), pinch_zoom_active_(false) { - setAttribute(Qt::WA_AcceptTouchEvents, true); - - setMouseTracking(true); setAutoFillBackground(true); setBackgroundRole(QPalette::Base); - - connect(&view_, SIGNAL(signals_moved()), - this, SLOT(on_signals_moved())); } -void Viewport::paintEvent(QPaintEvent*) +shared_ptr Viewport::get_mouse_over_item(const QPoint &pt) { - vector< shared_ptr > row_items(view_.begin(), view_.end()); - 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(); }); - - const vector< shared_ptr > time_items(view_.time_items()); - assert(none_of(time_items.begin(), time_items.end(), - [](const shared_ptr &t) { return !t; })); - - QPainter p(this); - p.setRenderHint(QPainter::Antialiasing); - const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset()); - - for (const shared_ptr t : time_items) - t->paint_back(p, pp); - 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) - r->paint_mid(p, pp); - - for (const shared_ptr r : row_items) - r->paint_fore(p, pp); - for (const shared_ptr t : time_items) - t->paint_fore(p, pp); - - 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); + const vector< shared_ptr > items(this->items()); + for (auto i = items.rbegin(); i != items.rend(); i++) + if ((*i)->enabled() && + (*i)->hit_box_rect(pp).contains(pt)) + return *i; + return nullptr; } -void Viewport::mousePressEvent(QMouseEvent *event) +void Viewport::item_hover(const shared_ptr &item) { - assert(event); - - if (event->button() == Qt::LeftButton) { - mouse_down_point_ = event->pos(); - mouse_down_offset_ = view_.offset(); - mouse_down_valid_ = true; - } + if (item && item->is_draggable()) + setCursor(dynamic_pointer_cast(item) ? + Qt::SizeVerCursor : Qt::SizeHorCursor); + else + unsetCursor(); } -void Viewport::mouseReleaseEvent(QMouseEvent *event) +void Viewport::drag() { - assert(event); - - if (event->button() == Qt::LeftButton) - mouse_down_valid_ = false; + drag_offset_ = view_.offset(); } -void Viewport::mouseMoveEvent(QMouseEvent *event) +void Viewport::drag_by(const QPoint &delta) { - 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; - } + if (drag_offset_ == boost::none) + return; - view_.set_scale_offset(view_.scale(), - mouse_down_offset_ + - (mouse_down_point_ - event->pos()).x() * - view_.scale()); - } + view_.set_scale_offset(view_.scale(), + (*drag_offset_ - delta.x() * view_.scale())); } -void Viewport::mouseDoubleClickEvent(QMouseEvent *event) +void Viewport::drag_release() { - assert(event); - - if (event->buttons() & Qt::LeftButton) - view_.zoom(2.0, event->x()); - else if (event->buttons() & Qt::RightButton) - view_.zoom(-2.0, event->x()); + drag_offset_ = boost::none; } -void Viewport::wheelEvent(QWheelEvent *event) +vector< shared_ptr > Viewport::items() { - 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()); - } + 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; } -bool Viewport::touchEvent(QTouchEvent *event) +bool Viewport::touch_event(QTouchEvent *event) { QList touchPoints = event->touchPoints(); @@ -188,16 +119,15 @@ bool Viewport::touchEvent(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); @@ -208,22 +138,89 @@ bool Viewport::touchEvent(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(); } } return true; } -void Viewport::on_signals_moved() +void Viewport::paintEvent(QPaintEvent*) +{ + 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->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(), + [](const shared_ptr &t) { return !t; })); + + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); + + const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset()); + + for (const shared_ptr t : time_items) + t->paint_back(p, pp); + 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) + r->paint_mid(p, pp); + + 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::mouseDoubleClickEvent(QMouseEvent *event) +{ + assert(event); + + if (event->buttons() & Qt::LeftButton) + view_.zoom(2.0, event->x()); + else if (event->buttons() & Qt::RightButton) + view_.zoom(-2.0, event->x()); +} + +void Viewport::wheelEvent(QWheelEvent *e) { - update(); + 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(), + e->delta() * view_.scale() + view_.offset()); + } } } // namespace view