* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "view.h"
-#include "viewport.h"
+#include <cassert>
+#include <cmath>
+#include <algorithm>
-#include "signal.h"
-#include "../sigsession.h"
+#include "signal.hpp"
+#include "view.hpp"
+#include "viewitempaintparams.hpp"
+#include "viewport.hpp"
-#include <QMouseEvent>
+#include <pv/session.hpp>
-#include <boost/foreach.hpp>
+#include <QMouseEvent>
-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 {
Viewport::Viewport(View &parent) :
- QWidget(&parent),
- _view(parent)
+ ViewWidget(parent),
+ mouse_down_valid_(false),
+ pinch_zoom_active_(false)
{
- setMouseTracking(true);
+ setAttribute(Qt::WA_AcceptTouchEvents, true);
+
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
- connect(&_view, SIGNAL(signals_moved()),
+ connect(&view_, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
-int Viewport::get_total_height() const
+void Viewport::paintEvent(QPaintEvent*)
{
- int h = 0;
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
- assert(s);
- h = max(s->get_v_offset() + View::SignalHeight, h);
- }
+ vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+ assert(none_of(row_items.begin(), row_items.end(),
+ [](const shared_ptr<RowItem> &r) { return !r; }));
- return h;
-}
+ stable_sort(row_items.begin(), row_items.end(),
+ [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+ return a->visual_v_offset() < b->visual_v_offset(); });
-void Viewport::paintEvent(QPaintEvent *event)
-{
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
+ const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+ assert(none_of(time_items.begin(), time_items.end(),
+ [](const shared_ptr<TimeItem> &t) { return !t; }));
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
- draw_cursors_background(p);
-
- // Plot the signal
- const int v_offset = _view.v_offset();
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
- {
- assert(s);
+ const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
- const QRect signal_rect(0, s->get_v_offset() - v_offset,
- width(), View::SignalHeight);
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_back(p, pp);
+ for (const shared_ptr<RowItem> r : row_items)
+ r->paint_back(p, pp);
- s->paint(p, signal_rect, _view.scale(), _view.offset());
- }
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_mid(p, pp);
+ for (const shared_ptr<RowItem> r : row_items)
+ r->paint_mid(p, pp);
- draw_cursors_foreground(p);
+ for (const shared_ptr<RowItem> r : row_items)
+ r->paint_fore(p, pp);
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_fore(p, pp);
p.end();
}
+bool Viewport::event(QEvent *event)
+{
+ switch (event->type()) {
+ case QEvent::TouchBegin:
+ case QEvent::TouchUpdate:
+ case QEvent::TouchEnd:
+ if (touchEvent(static_cast<QTouchEvent *>(event)))
+ return true;
+ break;
+
+ default:
+ break;
+ }
+
+ 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)
- {
- _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());
+
+ 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::draw_cursors_background(QPainter &p)
+bool Viewport::touchEvent(QTouchEvent *event)
{
- if (!_view.cursors_shown())
- return;
+ QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
- p.setPen(Qt::NoPen);
- p.setBrush(QBrush(View::CursorAreaColour));
+ if (touchPoints.count() != 2) {
+ pinch_zoom_active_ = false;
+ return false;
+ }
- const pair<Cursor, Cursor> &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());
+ const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
+ const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
- p.drawRect(l, 0, r - l, height());
-}
+ 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;
+ }
-void Viewport::draw_cursors_foreground(QPainter &p)
-{
- if (!_view.cursors_shown())
- return;
+ 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;
+ }
+ }
- const QRect r = rect();
- pair<Cursor, Cursor> &cursors = _view.cursors();
- cursors.first.paint(p, r);
- cursors.second.paint(p, r);
+ return true;
}
void Viewport::on_signals_moved()
projects / pulseview.git / blobdiff