X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=f5f0ab59fb2f949caf1bef931b506d0d859b185a;hp=c0e9a69e3679f4796512160918b60136817c5ac7;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hpb=aa59d5c201c953b3edce658bc677ac78f6f6612d diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index c0e9a69e..f5f0ab59 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -22,11 +22,12 @@ #include #include -#include "view.h" -#include "viewport.h" +#include "rowitempaintparams.hpp" +#include "signal.hpp" +#include "view.hpp" +#include "viewport.hpp" -#include "signal.h" -#include "../sigsession.h" +#include #include @@ -42,9 +43,9 @@ namespace view { Viewport::Viewport(View &parent) : QWidget(&parent), - _view(parent), - _mouse_down_valid(false), - _pinch_zoom_active(false) + view_(parent), + mouse_down_valid_(false), + pinch_zoom_active_(false) { setAttribute(Qt::WA_AcceptTouchEvents, true); @@ -52,53 +53,40 @@ Viewport::Viewport(View &parent) : setAutoFillBackground(true); setBackgroundRole(QPalette::Base); - connect(&_view.session(), SIGNAL(signals_changed()), - this, SLOT(on_signals_changed())); - - connect(&_view, SIGNAL(signals_moved()), + connect(&view_, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); - - // Trigger the initial event manually. The default device has signals - // which were created before this object came into being - on_signals_changed(); -} - -int Viewport::get_total_height() const -{ - int h = 0; - for (auto &i : _view) - h = max(i->v_offset() + View::SignalHeight, h); - return h; } void Viewport::paintEvent(QPaintEvent*) { - vector< shared_ptr > row_items(_view.begin(), _view.end()); + 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(); }); + return a->visual_v_offset() < b->visual_v_offset(); }); QPainter p(this); p.setRenderHint(QPainter::Antialiasing); - if (_view.cursors_shown()) - _view.cursors().draw_viewport_background(p, rect()); + if (view_.cursors_shown()) + view_.cursors().draw_viewport_background(p, rect()); + + const RowItemPaintParams pp(0, width(), view_.scale(), view_.offset()); // Plot the signal for (const shared_ptr r : row_items) { assert(r); - r->paint_back(p, 0, width()); + r->paint_back(p, pp); } for (const shared_ptr r : row_items) - r->paint_mid(p, 0, width()); + r->paint_mid(p, pp); for (const shared_ptr r : row_items) - r->paint_fore(p, 0, width()); + r->paint_fore(p, pp); - if (_view.cursors_shown()) - _view.cursors().draw_viewport_foreground(p, rect()); + if (view_.cursors_shown()) + view_.cursors().draw_viewport_foreground(p, rect()); p.end(); } @@ -125,9 +113,9 @@ void Viewport::mousePressEvent(QMouseEvent *event) assert(event); if (event->button() == Qt::LeftButton) { - _mouse_down_point = event->pos(); - _mouse_down_offset = _view.offset(); - _mouse_down_valid = true; + mouse_down_point_ = event->pos(); + mouse_down_offset_ = view_.offset(); + mouse_down_valid_ = true; } } @@ -136,7 +124,7 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event) assert(event); if (event->button() == Qt::LeftButton) - _mouse_down_valid = false; + mouse_down_valid_ = false; } void Viewport::mouseMoveEvent(QMouseEvent *event) @@ -144,16 +132,16 @@ void Viewport::mouseMoveEvent(QMouseEvent *event) assert(event); if (event->buttons() & Qt::LeftButton) { - if (!_mouse_down_valid) { - _mouse_down_point = event->pos(); - _mouse_down_offset = _view.offset(); - _mouse_down_valid = true; + 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()); + view_.set_scale_offset(view_.scale(), + mouse_down_offset_ + + (mouse_down_point_ - event->pos()).x() * + view_.scale()); } } @@ -162,9 +150,9 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event) assert(event); if (event->buttons() & Qt::LeftButton) - _view.zoom(2.0, event->x()); + view_.zoom(2.0, event->x()); else if (event->buttons() & Qt::RightButton) - _view.zoom(-2.0, event->x()); + view_.zoom(-2.0, event->x()); } void Viewport::wheelEvent(QWheelEvent *event) @@ -173,12 +161,12 @@ 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()); + view_.set_scale_offset(view_.scale(), + event->delta() * view_.scale() + + view_.offset()); } } @@ -187,57 +175,48 @@ bool Viewport::touchEvent(QTouchEvent *event) QList touchPoints = event->touchPoints(); if (touchPoints.count() != 2) { - _pinch_zoom_active = false; + pinch_zoom_active_ = false; return false; } const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); - if (!_pinch_zoom_active || + 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; + 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; + double scale = (pinch_offset1_ - pinch_offset0_) / w; if (scale < 0) scale = -scale; - double offset = _pinch_offset0 - touchPoint0.pos().x() * scale; + double offset = pinch_offset0_ - touchPoint0.pos().x() * scale; if (scale > 0) - _view.set_scale_offset(scale, offset); + view_.set_scale_offset(scale, offset); } if (event->touchPointStates() & Qt::TouchPointReleased) { - _pinch_zoom_active = false; + pinch_zoom_active_ = false; if (touchPoint0.state() & Qt::TouchPointReleased) { // Primary touch released - _mouse_down_valid = false; + 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; + mouse_down_point_ = touchPoint0.pos().toPoint(); + mouse_down_offset_ = view_.offset(); + mouse_down_valid_ = true; } } return true; } -void Viewport::on_signals_changed() -{ - for (shared_ptr r : _view) { - assert(r); - connect(r.get(), SIGNAL(visibility_changed()), - this, SLOT(update())); - } -} - void Viewport::on_signals_moved() { update();