X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=8963e047b355dc8f3f0d2d2eba30fd2cb3b92766;hp=70282d41c4acfbd1cbe759411a716de241079aee;hb=14009012e02866aa8e8d338026901d180d00fcc6;hpb=b42d25c43e52c900cbdd3e5cde0282961b8721e7 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 70282d41..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,18 +30,24 @@ #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); @@ -49,54 +59,99 @@ Viewport::Viewport(View &parent) : int Viewport::get_total_height() const { int h = 0; - const vector< shared_ptr > sigs( - _view.session().get_signals()); - BOOST_FOREACH(const shared_ptr s, sigs) { - assert(s); - h = max(s->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 > sigs( - _view.session().get_signals()); + 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); - draw_cursors_background(p); + if (_view.cursors_shown()) + _view.cursors().draw_viewport_background(p, rect()); // Plot the signal - const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) + for (const shared_ptr r : row_items) { - assert(s); - s->paint(p, s->get_v_offset() - v_offset, 0, width(), - _view.scale(), _view.offset()); + assert(r); + r->paint_back(p, 0, width()); } - draw_cursors_foreground(p); + for (const shared_ptr r : row_items) + r->paint_mid(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()); 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() * @@ -104,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); @@ -119,32 +184,51 @@ void Viewport::wheelEvent(QWheelEvent *event) } } -void Viewport::draw_cursors_background(QPainter &p) +bool Viewport::touchEvent(QTouchEvent *event) { - if (!_view.cursors_shown()) - return; + QList touchPoints = event->touchPoints(); - p.setPen(Qt::NoPen); - p.setBrush(QBrush(View::CursorAreaColour)); + if (touchPoints.count() != 2) { + _pinch_zoom_active = false; + return false; + } - const CursorPair &c = _view.cursors(); - const float x1 = (c.first().time() - _view.offset()) / _view.scale(); - const float x2 = (c.second().time() - _view.offset()) / _view.scale(); - const int l = (int)max(min(x1, x2), 0.0f); - const int r = (int)min(max(x1, x2), (float)width()); + const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); + const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); - p.drawRect(l, 0, r - l, height()); -} + 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; + } -void Viewport::draw_cursors_foreground(QPainter &p) -{ - if (!_view.cursors_shown()) - return; + 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; + } + } - const QRect r = rect(); - CursorPair &cursors = _view.cursors(); - cursors.first().paint(p, r); - cursors.second().paint(p, r); + return true; } void Viewport::on_signals_moved()