X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=75902af2bc7588ba08fc9d4b6fe883e886e108c8;hp=2b03b76723147852cede33b727fa6e549785d21d;hb=5c5ce7574062e0d3ad4f7d9dde70b482315d54fb;hpb=ffd5cd208c277b148d0e3a85d49330149f02f0c8 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 2b03b767..75902af2 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -18,98 +18,141 @@ * 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, SIGNAL(signals_moved()), + connect(&view_, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); } -int Viewport::get_total_height() const +void Viewport::paintEvent(QPaintEvent*) { - 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); - } - - return h; -} - -void Viewport::paintEvent(QPaintEvent *event) -{ - 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->visual_v_offset() < b->visual_v_offset(); }); QPainter p(this); p.setRenderHint(QPainter::Antialiasing); - draw_cursors_background(p); + if (view_.cursors_shown()) + view_.cursors()->draw_viewport_background(p, rect()); + + const RowItemPaintParams pp(0, width(), view_.scale(), view_.offset()); // 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); + assert(r); + r->paint_back(p, pp); + } - const QRect signal_rect(0, s->get_v_offset() - v_offset, - width(), View::SignalHeight); + for (const shared_ptr r : row_items) + r->paint_mid(p, pp); - s->paint(p, signal_rect, _view.scale(), _view.offset()); - } + for (const shared_ptr r : row_items) + r->paint_fore(p, pp); - draw_cursors_foreground(p); + 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()); } } -void Viewport::mouseReleaseEvent(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) @@ -118,36 +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()); } } -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 pair &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(); - pair &cursors = _view.cursors(); - cursors.first.paint(p, r); - cursors.second.paint(p, r); + return true; } void Viewport::on_signals_moved()