X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=0e89f3ad96fc6b983d3ed1d9d8fe2cb495e59f2b;hb=1c91f1a230ac7f61ad0c2ed9718d12514353b629;hp=83df7aa4d1eaaa9543add3896e2b6363457ba200;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 83df7aa..0e89f3a 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -49,8 +49,6 @@ Viewport::Viewport(View &parent) :
 	mouse_down_valid_(false),
 	pinch_zoom_active_(false)
 {
-	setAttribute(Qt::WA_AcceptTouchEvents, true);
-
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
 }
@@ -73,6 +71,52 @@ vector< shared_ptr<ViewItem> > Viewport::items()
 	return items;
 }
 
+bool Viewport::touch_event(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) {
+		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*)
 {
 	vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
@@ -110,23 +154,6 @@ 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);
@@ -189,52 +216,5 @@ 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;
-}
-
 } // namespace view
 } // namespace pv