changed 3D rendering

added pan/zoom gesture

mapview/2D/MapView2D.cpp

@@ -30,6 +30,11 @@ MapView2D::MapView2D(QWidget* parent) : QOpenGLWidget(parent) {
 	// defaults
 	s.setScale(5);
 
+	// android
+	setAttribute(Qt::WA_AcceptTouchEvents);
+    grabGesture(Qt::PanGesture);
+    grabGesture(Qt::PinchGesture);
+
 }
 
 void MapView2D::paintGL() {
@@ -92,3 +97,57 @@ void MapView2D::mouseReleaseEvent(QMouseEvent* e) {
 	tools.mouseReleaseEvent(this, e);
 	update();
 }
+
+
+// android
+bool MapView2D::event(QEvent* event) {
+
+	if (event->type() == QEvent::Gesture) {
+		return gestureEvent(static_cast<QGestureEvent*>(event));
+	} else {
+		return QWidget::event(event);
+	}
+
+}
+
+bool MapView2D::gestureEvent(QGestureEvent* event) {
+	//qCDebug(lcExample) << "gestureEvent():" << event;
+	if (QGesture *swipe = event->gesture(Qt::SwipeGesture)) {
+        //swipeTriggered(static_cast<QSwipeGesture *>(swipe));
+	} else if (QGesture *pan = event->gesture(Qt::PanGesture))
+        panTriggered(static_cast<QPanGesture *>(pan));
+	if (QGesture *pinch = event->gesture(Qt::PinchGesture)) {
+		pinchTriggered(static_cast<QPinchGesture *>(pinch));
+	}
+	return true;
+}
+
+void MapView2D::pinchTriggered(QPinchGesture* gesture) {
+
+	tools.pinchTriggered(this, gesture);
+	update();
+
+//	QPinchGesture::ChangeFlags changeFlags = gesture->changeFlags();
+//	if (changeFlags & QPinchGesture::RotationAngleChanged) {
+////		qreal rotationDelta = gesture->rotationAngle() - gesture->lastRotationAngle();
+////		rotationAngle += rotationDelta;
+////		qCDebug(lcExample) << "pinchTriggered(): rotate by" <<
+////			rotationDelta << "->" << rotationAngle;
+//	}
+//	if (changeFlags & QPinchGesture::ScaleFactorChanged) {
+////		currentStepScaleFactor = gesture->totalScaleFactor();
+////		qCDebug(lcExample) << "pinchTriggered(): zoom by" <<
+////			gesture->scaleFactor() << "->" << currentStepScaleFactor;
+//		std::cout << gesture->totalScaleFactor() << std::endl;
+//	}
+//	if (gesture->state() == Qt::GestureFinished) {
+////		scaleFactor *= currentStepScaleFactor;
+////		currentStepScaleFactor = 1;
+//	}
+//	update();
+}
+
+void MapView2D::panTriggered(QPanGesture* gesture) {
+    tools.panTriggered(this, gesture);
+    update();
+}

mapview/2D/MapView2D.h

@@ -10,6 +10,9 @@
 class MapModel;
 class MV2DElement;
 
+class QGestureEvent;
+class QPinchGesture;
+class QSwipeGesture;
 #include "tools/Tools.h"
 
 
@@ -80,6 +83,12 @@ protected:
 
 	void keyPressEvent(QKeyEvent* e);
 
+	// android
+	bool event(QEvent *e) override;
+	bool gestureEvent(QGestureEvent* event);
+    void pinchTriggered(QPinchGesture* gesture);
+    void panTriggered(QPanGesture* gesture);
+
 };
 
 #endif // MAP2D_H

mapview/2D/tools/Tool.h

@@ -9,6 +9,8 @@
 
 #include "../Painter.h"
 
+class QPinchGesture;
+class QPanGesture;
 class MapView2D;
 
 /**
@@ -46,6 +48,9 @@ public:
 
 	virtual bool keyPressEvent(MapView2D* m, QKeyEvent* e) { (void) m; (void) e; return false; }
 
+	virtual bool pinchTriggered(MapView2D* m, QPinchGesture* g) { (void) m; (void) g; return false; }
+    virtual bool panTriggered(MapView2D* m, QPanGesture* g) { (void) m; (void) g; return false; }
+
 	virtual void paintBefore(MapView2D* m, Painter& p) { (void) m; (void) p; }
 	virtual void paintAfter(MapView2D* m, Painter& p) { (void) m; (void) p; }
 

mapview/2D/tools/ToolMapZoom.h

@@ -9,6 +9,8 @@
  */
 class ToolMapZoom : public Tool {
 
+	float startScale = NAN;
+
 public:
 
 	const std::string getName() const override {
@@ -32,6 +34,34 @@ public:
 
 	}
 
+	virtual bool pinchTriggered(MapView2D *m, QPinchGesture* g) override {
+
+		Scaler& s = m->getScaler();
+		// https://doc.qt.io/qt-5/qtwidgets-gestures-imagegestures-example.html
+
+		QPinchGesture::ChangeFlags changeFlags = g->changeFlags();
+		if (changeFlags & QPinchGesture::RotationAngleChanged) {
+//				qreal rotationDelta = gesture->rotationAngle() - gesture->lastRotationAngle();
+//				rotationAngle += rotationDelta;
+//				qCDebug(lcExample) << "pinchTriggered(): rotate by" <<
+//					rotationDelta << "->" << rotationAngle;
+		}
+		if (changeFlags & QPinchGesture::ScaleFactorChanged) {
+			if (startScale != startScale) {startScale = s.getScale();}
+			s.setScale(startScale * g->totalScaleFactor());
+		}
+		if (g->state() == Qt::GestureFinished) {
+			startScale = NAN;
+		}
+
+		if (s.getScale() > 1000) {s.setScale(1000);}
+		if (s.getScale() < 5) {s.setScale(5);}
+
+		return true;
+
+
+	}
+
 };
 
 #endif // TOOLMAPZOOM_H

mapview/2D/tools/ToolMoveMap.h

@@ -4,6 +4,8 @@
 #include "Tool.h"
 #include "../MapView2D.h"
 
+#include <QPanGesture>
+
 /**
  * this tool allows moving the 2D map
  * using the mouse
@@ -48,6 +50,11 @@ public:
 		return false;
 	}
 
+    virtual bool panTriggered(MapView2D *m, QPanGesture *g) override {
+        m->getScaler().addOffset(g->delta().x(), g->delta().y());
+        return true;
+    }
+
 //	virtual void keyPressEvent(MapView2D* m, QKeyEvent* e) override {
 //		(void) m;
 //		(void) e;

mapview/2D/tools/ToolRuler.h

@@ -67,25 +67,23 @@ public:
 		// the visible map-rect
 		const Rect r = p.getScaler().getMapVisible(w, h, step);
 
-		QRect rx(rs,0,w-1-rs,rs);
+		QRect rx(rs,0,w-0-rs,rs);
 		QRect ry(0,rs,rs,h-1-rs);
 
 		// background
 		{
 
-			// samller font
-			QFont f = p.p->font(); f.setPointSize(8);
-			p.p->setFont(f);
-
 			// outline
 			p.setPen(Qt::darkGray);
+			p.setBrush(QColor(240,240,240));
+
 
 			// x-axis
-			QLinearGradient gx(0,0,0,rs); gx.setColorAt(0, c1); gx.setColorAt(1, c2); p.setBrush(gx);
+			//QLinearGradient gx(0,0,0,rs); gx.setColorAt(0, c1); gx.setColorAt(1, c2); p.setBrush(gx);
 			p.p->drawRect(rx);
 
 			// y-axis
-			QLinearGradient gy(0,0,rs,0); gy.setColorAt(0, c2); gy.setColorAt(1, c1); p.setBrush(gy);
+			//QLinearGradient gy(0,0,rs,0); gy.setColorAt(0, c2); gy.setColorAt(1, c1); p.setBrush(gy);
 			p.p->drawRect(ry);
 
 		}
@@ -101,6 +99,10 @@ public:
 		p.setPenBrush(Qt::black, Qt::NoBrush);
 		char buf[128];
 
+		// samller font
+		QFont f = p.p->font(); f.setPointSize(8);
+		p.p->setFont(f);
+
 		// coordinates
 		QRect ru(0,0,rs-1,rs-1);
 		p.p->fillRect(ru, Qt::white);

mapview/2D/tools/Tools.h

@@ -5,6 +5,8 @@
 #include "../../../fixC11.h"
 #include "Tool.h"
 
+class QPinchGesture;
+
 /**
  * combine several tools under the interface for one tool
  */
@@ -118,6 +120,17 @@ public:
 		return false;
 	}
 
+	virtual bool pinchTriggered(MapView2D* m, QPinchGesture* g) {//override {
+		if (mainTool) {mainTool->pinchTriggered(m, g);}
+		for (Tool* t : backgroundTools) { if(t->pinchTriggered(m, g)) {return true;} }
+		return false;
+	}
+
+    virtual bool panTriggered(MapView2D* m, QPanGesture* g) {//override {
+        if (mainTool) {mainTool->panTriggered(m, g);}
+        for (Tool* t : backgroundTools) { if(t->panTriggered(m, g)) {return true;} }
+        return false;
+    }
 
 	virtual void paintBefore(MapView2D* m, Painter& p) {//override {
 		for (Tool* t : backgroundTools) {t->paintBefore(m, p);}