X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=8963e047b355dc8f3f0d2d2eba30fd2cb3b92766;hp=a06c8888761f6c1237ffde3c5aecc8ceb2ff5df1;hb=14009012e02866aa8e8d338026901d180d00fcc6;hpb=aca00b1e0d3483926c53dfd856483a397f1c29a5 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index a06c8888..8963e047 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include +#include + #include "view.h" #include "viewport.h" @@ -26,25 +30,28 @@ #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()), this, SLOT(on_signals_moved())); } @@ -52,18 +59,26 @@ Viewport::Viewport(View &parent) : 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); - } - + for (auto &i : _view) + h = max(i->v_offset() + View::SignalHeight, h); return h; } +void Viewport::signals_updated() +{ + for (shared_ptr r : _view) { + assert(r); + connect(r.get(), SIGNAL(appearance_changed()), + this, SLOT(update())); + } +} + 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->v_offset() < b->v_offset(); }); QPainter p(this); p.setRenderHint(QPainter::Antialiasing); @@ -72,17 +87,17 @@ void Viewport::paintEvent(QPaintEvent*) _view.cursors().draw_viewport_background(p, rect()); // 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, 0, width()); } - BOOST_FOREACH(const shared_ptr t, traces) - t->paint_mid(p, 0, width()); + for (const shared_ptr r : row_items) + r->paint_mid(p, 0, width()); - BOOST_FOREACH(const shared_ptr t, traces) - t->paint_fore(p, 0, width()); + for (const shared_ptr r : row_items) + r->paint_fore(p, 0, width()); if (_view.cursors_shown()) _view.cursors().draw_viewport_foreground(p, rect()); @@ -90,20 +105,53 @@ 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); - _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) - { + 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() * @@ -111,6 +159,16 @@ void Viewport::mouseMoveEvent(QMouseEvent *event) } } +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 *event) { assert(event); @@ -126,14 +184,51 @@ void Viewport::wheelEvent(QWheelEvent *event) } } -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()