X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=43da472890120e4eb01acfb59fdd14db0d716cc0;hp=c5789630be883ed2bb45b3154576eafb4bad0a4b;hb=68b21a71797051fb48ed272bc2a6b4893bdbf517;hpb=d23445348bf04a698e062a3b917360313ecbcaad

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index c5789630..43da4728 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -19,6 +19,8 @@
  */
 
 #include <cassert>
+#include <cmath>
+#include <algorithm>
 
 #include "view.h"
 #include "viewport.h"
@@ -28,9 +30,11 @@
 
 #include <QMouseEvent>
 
+using std::abs;
 using std::max;
 using std::min;
 using std::shared_ptr;
+using std::stable_sort;
 using std::vector;
 
 namespace pv {
@@ -38,8 +42,12 @@ namespace view {
 
 Viewport::Viewport(View &parent) :
 	QWidget(&parent),
-        _view(parent)
+	_view(parent),
+	_mouse_down_valid(false),
+	_pinch_zoom_active(false)
 {
+	setAttribute(Qt::WA_AcceptTouchEvents, true);
+
 	setMouseTracking(true);
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
@@ -58,10 +66,10 @@ Viewport::Viewport(View &parent) :
 int Viewport::get_total_height() const
 {
 	int h = 0;
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	for (const shared_ptr<Trace> t : traces) {
-		assert(t);
-		h = max(t->get_v_offset() + View::SignalHeight, h);
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	for (const shared_ptr<RowItem> r : row_items) {
+		assert(r);
+		h = max(r->v_offset() + View::SignalHeight, h);
 	}
 
 	return h;
@@ -69,7 +77,10 @@ int Viewport::get_total_height() const
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	stable_sort(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->v_offset() < b->v_offset(); });
 
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
@@ -78,17 +89,17 @@ void Viewport::paintEvent(QPaintEvent*)
 		_view.cursors().draw_viewport_background(p, rect());
 
 	// Plot the signal
-	for (const shared_ptr<Trace> t : traces)
+	for (const shared_ptr<RowItem> r : row_items)
 	{
-		assert(t);
-		t->paint_back(p, 0, width());
+		assert(r);
+		r->paint_back(p, 0, width());
 	}
 
-	for (const shared_ptr<Trace> t : traces)
-		t->paint_mid(p, 0, width());
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_mid(p, 0, width());
 
-	for (const shared_ptr<Trace> t : traces)
-		t->paint_fore(p, 0, width());
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_fore(p, 0, width());
 
 	if (_view.cursors_shown())
 		_view.cursors().draw_viewport_foreground(p, rect());
@@ -96,20 +107,53 @@ void Viewport::paintEvent(QPaintEvent*)
 	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)
-	{
+	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() *
@@ -142,12 +186,59 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
+bool Viewport::touchEvent(QTouchEvent *event)
+{
+	QList<QTouchEvent::TouchPoint> 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;
+	}
+
+	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_changed()
 {
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	for (shared_ptr<Trace> t : traces) {
-		assert(t);
-		connect(t.get(), SIGNAL(visibility_changed()),
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	for (shared_ptr<RowItem> r : row_items) {
+		assert(r);
+		connect(r.get(), SIGNAL(visibility_changed()),
 			this, SLOT(update()));
 	}
 }