X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=0c33fe2c4a00685976320634315c26b8ffd90185;hp=b8598bcb619534b597d66e9b9d21a071049f63b5;hb=40aca27ed83559f7f79873e353f64d2c36a18fce;hpb=1d19ef83d7598f3248086d456df55e844b229bb3 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index b8598bcb..0c33fe2c 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,233 +18,210 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "view.h" -#include "viewport.h" +#include +#include +#include -#include "../../sigsession.h" -#include "../../signal.h" +#include "signal.hpp" +#include "view.hpp" +#include "viewitempaintparams.hpp" +#include "viewport.hpp" -#include "../../extdef.h" +#include #include -#include -#include - -#include - -using namespace boost; -using namespace std; +using std::abs; +using std::max; +using std::min; +using std::none_of; +using std::shared_ptr; +using std::stable_sort; +using std::vector; namespace pv { namespace view { -const int Viewport::SignalHeight = 50; - -const int Viewport::MinorTickSubdivision = 4; -const int Viewport::ScaleUnits[3] = {1, 2, 5}; - -const QString Viewport::SIPrefixes[9] = - {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; -const int Viewport::FirstSIPrefixPower = -15; - Viewport::Viewport(View &parent) : - QGLWidget(&parent), - _view(parent) -{ - setMouseTracking(true); - setAutoFillBackground(false); -} - -int Viewport::get_total_height() const + ViewWidget(parent), + mouse_down_valid_(false), + pinch_zoom_active_(false) { - int height = 0; - BOOST_FOREACH(const shared_ptr s, - _view.session().get_signals()) { - assert(s); - height += SignalHeight; - } + setAttribute(Qt::WA_AcceptTouchEvents, true); - return height; -} + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); -void Viewport::initializeGL() -{ + connect(&view_, SIGNAL(signals_moved()), + this, SLOT(on_signals_moved())); } -void Viewport::resizeGL(int width, int height) +void Viewport::paintEvent(QPaintEvent*) { - setup_viewport(width, height); -} + vector< shared_ptr > row_items(view_.begin(), view_.end()); + assert(none_of(row_items.begin(), row_items.end(), + [](const shared_ptr &r) { return !r; })); -void Viewport::paintEvent(QPaintEvent *event) -{ - int offset; + 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(); }); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + const vector< shared_ptr > time_items(view_.time_items()); + assert(none_of(time_items.begin(), time_items.end(), + [](const shared_ptr &t) { return !t; })); - // Prepare for OpenGL rendering - makeCurrent(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); - setup_viewport(width(), height()); + const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset()); - qglClearColor(Qt::white); - glClear(GL_COLOR_BUFFER_BIT); + for (const shared_ptr t : time_items) + t->paint_back(p, pp); + for (const shared_ptr r : row_items) + r->paint_back(p, pp); - // Plot the signal - glEnable(GL_SCISSOR_TEST); - glScissor(View::LabelMarginWidth, 0, width(), height()); - offset = View::RulerHeight - _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); + for (const shared_ptr t : time_items) + t->paint_mid(p, pp); + for (const shared_ptr r : row_items) + r->paint_mid(p, pp); - const QRect signal_rect(View::LabelMarginWidth, offset, - width() - View::LabelMarginWidth, SignalHeight); + for (const shared_ptr r : row_items) + r->paint_fore(p, pp); + for (const shared_ptr t : time_items) + t->paint_fore(p, pp); - s->paint(*this, signal_rect, _view.scale(), _view.offset()); + p.end(); +} - offset += SignalHeight; +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; } - glDisable(GL_SCISSOR_TEST); - - // Prepare for QPainter rendering - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); - - QPainter painter(this); - painter.setRenderHint(QPainter::Antialiasing); - - // Paint the labels - offset = View::RulerHeight - _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); + return QWidget::event(event); +} - const QRect label_rect(0, offset, - View::LabelMarginWidth, SignalHeight); - s->paint_label(painter, label_rect); +void Viewport::mousePressEvent(QMouseEvent *event) +{ + assert(event); - offset += SignalHeight; + if (event->button() == Qt::LeftButton) { + mouse_down_point_ = event->pos(); + mouse_down_offset_ = view_.offset(); + mouse_down_valid_ = true; } - - // Paint the ruler - paint_ruler(painter); - - painter.end(); } -void Viewport::mousePressEvent(QMouseEvent *event) +void Viewport::mouseReleaseEvent(QMouseEvent *event) { assert(event); - _mouse_down_point = event->pos(); - _mouse_down_offset = _view.offset(); + 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) { assert(event); - _view.zoom(event->delta() / 120, event->x() - - View::LabelMarginWidth); -} -void Viewport::setup_viewport(int width, int height) -{ - glViewport(0, 0, (GLint)width, (GLint)height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, width, height, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); + 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()); + } } -void Viewport::paint_ruler(QPainter &p) +bool Viewport::touchEvent(QTouchEvent *event) { - const double MinSpacing = 80; - - const double min_period = _view.scale() * MinSpacing; - - const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10, order); - - int unit = 0; - double tick_period = 0.0f; - - do - { - tick_period = order_decimal * ScaleUnits[unit++]; - } while(tick_period < min_period && unit < countof(ScaleUnits)); - - const int prefix = (order - FirstSIPrefixPower) / 3; - assert(prefix >= 0); - assert(prefix < countof(SIPrefixes)); - - const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX, - Qt::AlignLeft | Qt::AlignTop, "8").height(); - - // Draw the tick marks - p.setPen(Qt::black); - - const double minor_tick_period = tick_period / MinorTickSubdivision; - const double first_major_division = - floor(_view.offset() / tick_period); - const double first_minor_division = - ceil(_view.offset() / minor_tick_period); - const double t0 = first_major_division * tick_period; - - int division = (int)round(first_minor_division - - first_major_division * MinorTickSubdivision); - while(1) - { - const double t = t0 + division * minor_tick_period; - const double x = (t - _view.offset()) / _view.scale() + - View::LabelMarginWidth; - - if(x >= width()) - break; - - if(division % MinorTickSubdivision == 0) - { - // Draw a major tick - QString s; - QTextStream ts(&s); - ts << (t / order_decimal) << SIPrefixes[prefix] << "s"; - p.drawText(x, 0, 0, text_height, Qt::AlignCenter | Qt::AlignTop | - Qt::TextDontClip, s); - p.drawLine(x, text_height, x, View::RulerHeight); - } - else - { - // Draw a minor tick - p.drawLine(x, - (text_height + View::RulerHeight) / 2, x, - View::RulerHeight); - } + QList touchPoints = event->touchPoints(); - division++; + 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() +{ + update(); } } // namespace view