X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=9e136664f5078b1510dbef92d57c972b61d981ba;hp=b437175f75fa89b0adc9f325d6f43ad98a4b30c9;hb=3370799041d0ee09bf1c7c4f006933778579c037;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index b437175f..9e136664 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,133 +18,209 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "view.h" -#include "viewport.h" +#include +#include +#include +#include -#include "../../sigsession.h" -#include "../../signal.h" +#include "signal.hpp" +#include "view.hpp" +#include "viewitempaintparams.hpp" +#include "viewport.hpp" -#include +#include -#include +#include -using namespace boost; -using namespace std; +using std::abs; +using std::back_inserter; +using std::copy; +using std::dynamic_pointer_cast; +using std::max; +using std::min; +using std::none_of; +using std::numeric_limits; +using std::shared_ptr; +using std::stable_sort; +using std::vector; namespace pv { namespace view { Viewport::Viewport(View &parent) : - QGLWidget(&parent), - _view(parent) + ViewWidget(parent), + pinch_zoom_active_(false) { - setMouseTracking(true); - setAutoFillBackground(false); + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); } -int Viewport::get_total_height() const +shared_ptr Viewport::get_mouse_over_item(const QPoint &pt) { - int height = 0; - BOOST_FOREACH(const shared_ptr s, - _view.session().get_signals()) { - assert(s); - height += View::SignalHeight; - } - - return height; + const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset()); + const vector< shared_ptr > items(this->items()); + for (auto i = items.rbegin(); i != items.rend(); i++) + if ((*i)->enabled() && + (*i)->hit_box_rect(pp).contains(pt)) + return *i; + return nullptr; } -void Viewport::initializeGL() +void Viewport::item_hover(const shared_ptr &item) { + if (item && item->is_draggable()) + setCursor(dynamic_pointer_cast(item) ? + Qt::SizeVerCursor : Qt::SizeHorCursor); + else + unsetCursor(); } -void Viewport::resizeGL(int width, int height) +void Viewport::drag() { - setup_viewport(width, height); + drag_offset_ = view_.offset(); + drag_v_offset_ = view_.owner_visual_v_offset(); } -void Viewport::paintEvent(QPaintEvent *event) +void Viewport::drag_by(const QPoint &delta) { - int offset; + if (drag_offset_ == boost::none) + return; - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + view_.set_scale_offset(view_.scale(), + (*drag_offset_ - delta.x() * view_.scale())); - // Prepare for OpenGL rendering - makeCurrent(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + view_.set_v_offset(-drag_v_offset_ - delta.y()); +} - setup_viewport(width(), height()); +void Viewport::drag_release() +{ + drag_offset_ = boost::none; +} - qglClearColor(Qt::white); - glClear(GL_COLOR_BUFFER_BIT); +vector< shared_ptr > Viewport::items() +{ + vector< shared_ptr > items; + const std::vector< shared_ptr > view_items( + view_.list_by_type()); + copy(view_items.begin(), view_items.end(), back_inserter(items)); + const vector< shared_ptr > time_items(view_.time_items()); + copy(time_items.begin(), time_items.end(), back_inserter(items)); + return items; +} - // Plot the signal - glEnable(GL_SCISSOR_TEST); - glScissor(0, 0, width(), height()); - offset = -_view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); +bool Viewport::touch_event(QTouchEvent *event) +{ + QList touchPoints = event->touchPoints(); - const QRect signal_rect(0, offset, - width(), View::SignalHeight); + if (touchPoints.count() != 2) { + pinch_zoom_active_ = false; + return false; + } - s->paint(*this, signal_rect, _view.scale(), _view.offset()); + const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); + const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); - offset += View::SignalHeight; + if (!pinch_zoom_active_ || + (event->touchPointStates() & Qt::TouchPointPressed)) { + pinch_offset0_ = (view_.offset() + view_.scale() * touchPoint0.pos().x()).convert_to(); + pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to(); + pinch_zoom_active_ = true; } - glDisable(GL_SCISSOR_TEST); + double w = touchPoint1.pos().x() - touchPoint0.pos().x(); + if (abs(w) >= 1.0) { + const double scale = + fabs((pinch_offset1_ - pinch_offset0_) / w); + double offset = pinch_offset0_ - touchPoint0.pos().x() * scale; + if (scale > 0) + view_.set_scale_offset(scale, offset); + } - // Prepare for QPainter rendering - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); + if (event->touchPointStates() & Qt::TouchPointReleased) { + pinch_zoom_active_ = false; + + if (touchPoint0.state() & Qt::TouchPointReleased) { + // Primary touch released + drag_release(); + } else { + // Update the mouse down fields so that continued + // dragging with the primary touch will work correctly + mouse_down_point_ = touchPoint0.pos().toPoint(); + drag(); + } + } - QPainter painter(this); - painter.end(); + return true; } -void Viewport::mousePressEvent(QMouseEvent *event) +void Viewport::paintEvent(QPaintEvent*) { - assert(event); + vector< shared_ptr > row_items(view_.list_by_type()); + assert(none_of(row_items.begin(), row_items.end(), + [](const shared_ptr &r) { return !r; })); - _mouse_down_point = event->pos(); - _mouse_down_offset = _view.offset(); -} + stable_sort(row_items.begin(), row_items.end(), + [](const shared_ptr &a, const shared_ptr &b) { + return a->point(QRect()).y() < b->point(QRect()).y(); }); -void Viewport::mouseMoveEvent(QMouseEvent *event) -{ - assert(event); + const vector< shared_ptr > time_items(view_.time_items()); + assert(none_of(time_items.begin(), time_items.end(), + [](const shared_ptr &t) { return !t; })); - if(event->buttons() & Qt::LeftButton) - { - _view.set_scale_offset(_view.scale(), - _mouse_down_offset + - (_mouse_down_point - event->pos()).x() * - _view.scale()); - } -} + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); -void Viewport::mouseReleaseEvent(QMouseEvent *event) -{ - assert(event); + const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset()); + + for (const shared_ptr t : time_items) + t->paint_back(p, pp); + for (const shared_ptr r : row_items) + r->paint_back(p, pp); + + for (const shared_ptr t : time_items) + t->paint_mid(p, pp); + for (const shared_ptr r : row_items) + r->paint_mid(p, pp); + + for (const shared_ptr r : row_items) + r->paint_fore(p, pp); + + p.setRenderHint(QPainter::Antialiasing, false); + for (const shared_ptr t : time_items) + t->paint_fore(p, pp); + + p.end(); } -void Viewport::wheelEvent(QWheelEvent *event) +void Viewport::mouseDoubleClickEvent(QMouseEvent *event) { assert(event); - _view.zoom(event->delta() / 120, event->x()); + + 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::setup_viewport(int width, int height) +void Viewport::wheelEvent(QWheelEvent *e) { - glViewport(0, 0, (GLint)width, (GLint)height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, width, height, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); + assert(e); + + if (e->orientation() == Qt::Vertical) { + if (e->modifiers() & Qt::ControlModifier) { + // Vertical scrolling with the control key pressed + // is intrepretted as vertical scrolling + view_.set_v_offset(-view_.owner_visual_v_offset() - + (e->delta() * height()) / (8 * 120)); + } else { + // Vertical scrolling is interpreted as zooming in/out + view_.zoom(e->delta() / 120, e->x()); + } + } else if (e->orientation() == Qt::Horizontal) { + // Horizontal scrolling is interpreted as moving left/right + view_.set_scale_offset(view_.scale(), + e->delta() * view_.scale() + view_.offset()); + } } } // namespace view