X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=0e89f3ad96fc6b983d3ed1d9d8fe2cb495e59f2b;hp=f39c8201421d43956e5b6e3bc72c2768ab0cf365;hb=1c91f1a230ac7f61ad0c2ed9718d12514353b629;hpb=e314eca490a09eec9ee851787f6e8c28805a81fd diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index f39c8201..0e89f3ad 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -18,70 +18,138 @@ * 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 "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::max; +using std::min; +using std::none_of; +using std::shared_ptr; +using std::stable_sort; +using std::vector; namespace pv { namespace view { Viewport::Viewport(View &parent) : - QWidget(&parent), - _view(parent) + ViewWidget(parent), + mouse_down_valid_(false), + pinch_zoom_active_(false) { - setMouseTracking(true); setAutoFillBackground(true); setBackgroundRole(QPalette::Base); +} - connect(&_view, SIGNAL(signals_moved()), - this, SLOT(on_signals_moved())); +shared_ptr Viewport::get_mouse_over_item(const QPoint &pt) +{ + const vector< shared_ptr > items(this->items()); + for (auto i = items.rbegin(); i != items.rend(); i++) + if ((*i)->enabled() && + (*i)->hit_box_rect(rect()).contains(pt)) + return *i; + return nullptr; } -int Viewport::get_total_height() const +vector< shared_ptr > Viewport::items() { - 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); + vector< shared_ptr > items(view_.begin(), view_.end()); + const vector< shared_ptr > time_items(view_.time_items()); + copy(time_items.begin(), time_items.end(), back_inserter(items)); + return items; +} + +bool Viewport::touch_event(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; } - return h; + 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); + } + + 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::paintEvent(QPaintEvent*) { - const vector< shared_ptr > sigs( - _view.session().get_signals()); + vector< shared_ptr > row_items(view_.begin(), view_.end()); + assert(none_of(row_items.begin(), row_items.end(), + [](const shared_ptr &r) { return !r; })); + + 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 > time_items(view_.time_items()); + assert(none_of(time_items.begin(), time_items.end(), + [](const shared_ptr &t) { return !t; })); QPainter p(this); p.setRenderHint(QPainter::Antialiasing); - draw_cursors_background(p); + const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset()); - // Plot the signal - const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); + for (const shared_ptr t : time_items) + t->paint_back(p, pp); + for (const shared_ptr r : row_items) + r->paint_back(p, pp); - const QRect signal_rect(0, s->get_v_offset() - v_offset, - width(), View::SignalHeight); + for (const shared_ptr t : time_items) + t->paint_mid(p, pp); + for (const shared_ptr r : row_items) + r->paint_mid(p, pp); - s->paint(p, signal_rect, _view.scale(), _view.offset()); - } - - draw_cursors_foreground(p); + for (const shared_ptr r : row_items) + r->paint_fore(p, pp); + for (const shared_ptr t : time_items) + t->paint_fore(p, pp); p.end(); } @@ -90,26 +158,47 @@ 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,47 +207,14 @@ 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()); } } -void Viewport::draw_cursors_background(QPainter &p) -{ - if (!_view.cursors_shown()) - return; - - p.setPen(Qt::NoPen); - p.setBrush(QBrush(View::CursorAreaColour)); - - 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()); - - p.drawRect(l, 0, r - l, height()); -} - -void Viewport::draw_cursors_foreground(QPainter &p) -{ - if (!_view.cursors_shown()) - return; - - const QRect r = rect(); - pair &cursors = _view.cursors(); - cursors.first.paint(p, r); - cursors.second.paint(p, r); -} - -void Viewport::on_signals_moved() -{ - update(); -} - } // namespace view } // namespace pv