X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=f5f0ab59fb2f949caf1bef931b506d0d859b185a;hp=145f040fc93be7413d23458e6383c971304073a8;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hpb=903038a8c9496b23d29535dd8c41a6c207c0831b diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 145f040f..f5f0ab59 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -18,96 +18,130 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "view.h" -#include "viewport.h" +#include +#include +#include -#include "signal.h" -#include "../sigsession.h" +#include "rowitempaintparams.hpp" +#include "signal.hpp" +#include "view.hpp" +#include "viewport.hpp" -#include +#include -#include +#include -using namespace boost; -using namespace std; +using std::abs; +using std::max; +using std::min; +using std::shared_ptr; +using std::stable_sort; +using std::vector; namespace pv { namespace view { Viewport::Viewport(View &parent) : QWidget(&parent), - _view(parent) + view_(parent), + mouse_down_valid_(false), + pinch_zoom_active_(false) { + setAttribute(Qt::WA_AcceptTouchEvents, true); + setMouseTracking(true); setAutoFillBackground(true); setBackgroundRole(QPalette::Base); - connect(&_view.session(), SIGNAL(signals_changed()), - this, SLOT(on_signals_changed())); - - connect(&_view, SIGNAL(signals_moved()), + connect(&view_, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); } -int Viewport::get_total_height() const -{ - int h = 0; - const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(const shared_ptr t, traces) { - assert(t); - h = max(t->get_v_offset() + View::SignalHeight, h); - } - - return h; -} - void Viewport::paintEvent(QPaintEvent*) { - const vector< shared_ptr > traces(_view.get_traces()); + vector< shared_ptr > row_items(view_.begin(), view_.end()); + 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(); }); QPainter p(this); p.setRenderHint(QPainter::Antialiasing); - if (_view.cursors_shown()) - _view.cursors().draw_viewport_background(p, rect()); + if (view_.cursors_shown()) + view_.cursors().draw_viewport_background(p, rect()); + + const RowItemPaintParams pp(0, width(), view_.scale(), view_.offset()); // Plot the signal - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr r : row_items) { - assert(t); - t->paint_back(p, 0, width()); + assert(r); + r->paint_back(p, pp); } - BOOST_FOREACH(const shared_ptr t, traces) - t->paint_mid(p, 0, width()); + for (const shared_ptr r : row_items) + r->paint_mid(p, pp); - BOOST_FOREACH(const shared_ptr t, traces) - t->paint_fore(p, 0, width()); + for (const shared_ptr r : row_items) + r->paint_fore(p, pp); - if (_view.cursors_shown()) - _view.cursors().draw_viewport_foreground(p, rect()); + if (view_.cursors_shown()) + view_.cursors().draw_viewport_foreground(p, rect()); 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); - _mouse_down_point = event->pos(); - _mouse_down_offset = _view.offset(); + 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) - { - _view.set_scale_offset(_view.scale(), - _mouse_down_offset + - (_mouse_down_point - event->pos()).x() * - _view.scale()); + 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()); } } @@ -116,9 +150,9 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event) assert(event); if (event->buttons() & Qt::LeftButton) - _view.zoom(2.0, event->x()); + view_.zoom(2.0, event->x()); else if (event->buttons() & Qt::RightButton) - _view.zoom(-2.0, event->x()); + view_.zoom(-2.0, event->x()); } void Viewport::wheelEvent(QWheelEvent *event) @@ -127,23 +161,60 @@ void Viewport::wheelEvent(QWheelEvent *event) if (event->orientation() == Qt::Vertical) { // Vertical scrolling is interpreted as zooming in/out - _view.zoom(event->delta() / 120, event->x()); + 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()); + view_.set_scale_offset(view_.scale(), + event->delta() * view_.scale() + + view_.offset()); } } -void Viewport::on_signals_changed() +bool Viewport::touchEvent(QTouchEvent *event) { - const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { - assert(t); - connect(t.get(), SIGNAL(visibility_changed()), - this, SLOT(update())); + 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; + } 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; + } + } + + return true; } void Viewport::on_signals_moved()