X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=b141c38ae35ab29b2b44233bff6e8d13be16de3d;hp=b437175f75fa89b0adc9f325d6f43ad98a4b30c9;hb=c8870d9e7af0af746776680a266d0da3ec3280ec;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index b437175f..b141c38a 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the PulseView project. * * Copyright (C) 2012 Joel Holdsworth * @@ -18,108 +18,136 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "view.h" #include "viewport.h" -#include "../../sigsession.h" -#include "../../signal.h" +#include "signal.h" +#include "../sigsession.h" #include -#include - -using namespace boost; -using namespace std; +using std::abs; +using std::max; +using std::min; +using std::shared_ptr; +using std::vector; namespace pv { namespace view { Viewport::Viewport(View &parent) : - QGLWidget(&parent), - _view(parent) + QWidget(&parent), + _view(parent), + _mouse_down_valid(false), + _pinch_zoom_active(false) { + setAttribute(Qt::WA_AcceptTouchEvents, true); + setMouseTracking(true); - setAutoFillBackground(false); -} + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); -int Viewport::get_total_height() const -{ - int height = 0; - BOOST_FOREACH(const shared_ptr s, - _view.session().get_signals()) { - assert(s); - height += View::SignalHeight; - } + connect(&_view.session(), SIGNAL(signals_changed()), + this, SLOT(on_signals_changed())); - return height; -} + connect(&_view, SIGNAL(signals_moved()), + this, SLOT(on_signals_moved())); -void Viewport::initializeGL() -{ + // Trigger the initial event manually. The default device has signals + // which were created before this object came into being + on_signals_changed(); } -void Viewport::resizeGL(int width, int height) +int Viewport::get_total_height() const { - setup_viewport(width, height); + int h = 0; + const vector< shared_ptr > traces(_view.get_traces()); + for (const shared_ptr t : traces) { + assert(t); + h = max(t->get_v_offset() + View::SignalHeight, h); + } + + return h; } -void Viewport::paintEvent(QPaintEvent *event) +void Viewport::paintEvent(QPaintEvent*) { - int offset; - - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + const vector< shared_ptr > traces(_view.get_traces()); - // Prepare for OpenGL rendering - makeCurrent(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); - setup_viewport(width(), height()); - - qglClearColor(Qt::white); - glClear(GL_COLOR_BUFFER_BIT); + if (_view.cursors_shown()) + _view.cursors().draw_viewport_background(p, rect()); // Plot the signal - glEnable(GL_SCISSOR_TEST); - glScissor(0, 0, width(), height()); - offset = -_view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) + for (const shared_ptr t : traces) { - assert(s); + assert(t); + t->paint_back(p, 0, width()); + } - const QRect signal_rect(0, offset, - width(), View::SignalHeight); + for (const shared_ptr t : traces) + t->paint_mid(p, 0, width()); - s->paint(*this, signal_rect, _view.scale(), _view.offset()); + for (const shared_ptr t : traces) + t->paint_fore(p, 0, width()); - offset += View::SignalHeight; - } + if (_view.cursors_shown()) + _view.cursors().draw_viewport_foreground(p, rect()); - glDisable(GL_SCISSOR_TEST); + p.end(); +} - // Prepare for QPainter rendering - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); +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; + } - QPainter painter(this); - painter.end(); + 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() * @@ -127,24 +155,91 @@ void Viewport::mouseMoveEvent(QMouseEvent *event) } } -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) { assert(event); - _view.zoom(event->delta() / 120, event->x()); + + 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()); + } +} + +bool Viewport::touchEvent(QTouchEvent *event) +{ + 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_changed() +{ + const vector< shared_ptr > traces(_view.get_traces()); + for (shared_ptr t : traces) { + assert(t); + connect(t.get(), SIGNAL(visibility_changed()), + this, SLOT(update())); + } } -void Viewport::setup_viewport(int width, int height) +void Viewport::on_signals_moved() { - glViewport(0, 0, (GLint)width, (GLint)height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, width, height, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); + update(); } } // namespace view