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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index c5789630..71086385 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <cassert>
+#include <cmath>
 
 #include "view.h"
 #include "viewport.h"
@@ -28,6 +29,7 @@
 
 #include <QMouseEvent>
 
+using std::abs;
 using std::max;
 using std::min;
 using std::shared_ptr;
@@ -38,8 +40,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);
@@ -61,7 +67,7 @@ int Viewport::get_total_height() const
 	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);
+		h = max(t->v_offset() + View::SignalHeight, h);
 	}
 
 	return h;
@@ -96,20 +102,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,6 +181,53 @@ 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());