performance enhancements

memory enhancements
prevent starting sensors more than once
fix for wifi lag issues
map scaling for huge buildings

ui/MainWindow.cpp

@@ -22,14 +22,20 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
 
 	mainMenu = new MainMenu(this);
 	infoWidget = new InfoWidget(this);
-	sensorWidget = new SensorDataWidget(this); sensorWidget->setVisible(false);
+	sensorWidget = new SensorDataWidget(this);
 
-	//sensorWidget->setVisible(false);
+	// ensure we are fullscreen
 	showMaximized();
 
 	sleep(1);
 	emit resizeEvent(nullptr);
 
+	// important! must be called AFTER window is visible
+	// otherwise MapView3D's openGL context is uninitialized.
+	sensorWidget->setVisible(false);
+	mapView2D->setVisible(true);
+	mapView3D->setVisible(false);
+
 }
 
 void MainWindow::resizeEvent(QResizeEvent* event) {

ui/map/2D/MapView2D.cpp

@@ -4,8 +4,10 @@
 #include <QResizeEvent>
 #include <QSlider>
 #include <QGridLayout>
+#include <QGestureEvent>
 
 #include <Indoor/floorplan/v2/Floorplan.h>
+#include <Indoor/floorplan/v2/FloorplanHelper.h>
 
 #include "Floor2D.h"
 #include "ColorPoints2D.h"
@@ -67,7 +69,12 @@ MapView2D::MapView2D(QWidget *parent) : QWidget(parent) {
 	lay->addWidget(btnLayerPlus, row, 2, 1, 1);
 
 
+	// start with invisible particles. speeds things up a bit
+	colorPoints->setVisible(false);
 
+	// we want to receive pinch gestures
+	//setAttribute(Qt::WA_AcceptTouchEvents, true);
+	grabGesture(Qt::PinchGesture);
 
 }
 
@@ -96,7 +103,11 @@ void MapView2D::setMap(WiFiCalibrationDataModel* mdl, Floorplan::IndoorMap* map)
 	wifiCalib = new WiFiCalibTool(mdl, map);
 	elementsB.push_back(wifiCalib);
 
-	scaler.setCenterM(Point2(70, 35));
+	const BBox3 bbox3 = FloorplanHelper::getBBox(map);
+	const BBox2 bbox2 = BBox2(bbox3.getMin().xy(), bbox3.getMax().xy());
+
+	scaler.setMapBBox(bbox2);
+	scaler.setCenterM(Point2(bbox2.getCenter().x, bbox2.getCenter().y));
 
 }
 
@@ -169,6 +180,16 @@ void MapView2D::mouseReleaseEvent(QMouseEvent* evt) {
 
 }
 
+void MapView2D::wheelEvent(QWheelEvent* event) {
+	if (event->delta() < 0) {
+		scaler.mulScale(0.5);
+		emit update();
+	} else {
+		scaler.mulScale(2.0);
+		emit update();
+	}
+}
+
 void MapView2D::paintEvent(QPaintEvent*) {
 
 	QPainter qp(this);
@@ -183,3 +204,42 @@ void MapView2D::paintEvent(QPaintEvent*) {
 	qp.end();
 
 }
+
+bool MapView2D::event(QEvent *event) {
+
+	switch (event->type()) {
+		case QEvent::Gesture:
+			return gestureEvent(static_cast<QGestureEvent*>(event));
+
+		case QEvent::TouchBegin:
+		case QEvent::TouchUpdate:
+		case QEvent::TouchEnd:
+
+			// prevent [additional] mouse events for undetected gestures [more than 1 finger]
+			// TODO: not yet stable... improvements?
+			if (static_cast<QTouchEvent*>(event)->touchPoints().count() == 2) {return true;}
+			break;
+
+		default:
+			break;
+	}
+
+	// event not consumed. bubble it to following stages.
+	// this will e.g. generate mouseMoveEvent etc.
+	return QWidget::event(event);
+
+}
+
+bool MapView2D::gestureEvent(QGestureEvent *event) {
+
+	if (QGesture* pinch = event->gesture(Qt::PinchGesture)) {
+		const QPinchGesture* pg = static_cast<QPinchGesture *>(pinch);
+		scaler.mulScale(pg->scaleFactor());
+		emit update();
+		return true;	// event consumed
+	}
+
+	// event not consumed
+	return false;
+
+}

ui/map/2D/MapView2D.h

@@ -21,6 +21,7 @@ class MyGridNode;
 class Renderable2D;
 class QSlider;
 class QPushButton;
+class QGestureEvent;
 class ColorPoints2D;
 class Path2D;
 
@@ -127,6 +128,10 @@ public slots:
 	void mousePressEvent(QMouseEvent*);
 	void mouseMoveEvent(QMouseEvent*);
 	void mouseReleaseEvent(QMouseEvent*);
+	void wheelEvent(QWheelEvent*);
+
+	bool event(QEvent*);
+	bool gestureEvent(QGestureEvent *event);
 
 };
 

ui/map/2D/Scaler2D.h

@@ -3,6 +3,7 @@
 
 #include <QPoint>
 #include <Indoor/geo/Point2.h>
+#include <Indoor/geo/BBox2.h>
 
 class Scaler2D {
 
@@ -13,6 +14,8 @@ private:
 	float rotation_rad = 0.0f;
 	float scaleFactor = 1;
 
+	BBox2 mapBBox_m;
+
 public:
 
 	Scaler2D() {
@@ -32,11 +35,17 @@ public:
 	/** change the point displayed within the center of the screen */
 	void setCenterM(const Point2 center_m) {
 		this->center_m = center_m;
+		if (!mapBBox_m.isInvalid()) {
+			if (this->center_m.x < mapBBox_m.getMin().x) {this->center_m.x = mapBBox_m.getMin().x;}
+			if (this->center_m.y < mapBBox_m.getMin().y) {this->center_m.y = mapBBox_m.getMin().y;}
+			if (this->center_m.x > mapBBox_m.getMax().x) {this->center_m.x = mapBBox_m.getMax().x;}
+			if (this->center_m.y > mapBBox_m.getMax().y) {this->center_m.y = mapBBox_m.getMax().y;}
+		}
 	}
 
 	/** change the point displayed within the center of the screen */
 	void setCenterPX(const Point2 center_px) {
-		this->center_m = pxToM(center_px);
+		setCenterM(pxToM(center_px));
 	}
 
 	Point2 getCenterPX() const {
@@ -48,10 +57,21 @@ public:
 		this->rotation_rad = rad;
 	}
 
+	/** set the map's scaling */
 	void setScale(const float scale) {
 		this->scaleFactor = scale;
+		if (this->scaleFactor < 0.1) {this->scaleFactor = 0.1;}
+		if (this->scaleFactor > 4.0) {this->scaleFactor = 4.0;}
 	}
 
+	void mulScale(const float mod) {
+		setScale(this->scaleFactor * mod);
+	}
+
+	/** set the map's bbox. used to prevent from scrolling outside of the map */
+	void setMapBBox(const BBox2 bbox_m) {
+		this->mapBBox_m = bbox_m;
+	}
 
 public:
 

ui/map/3D/MapView3D.cpp

@@ -108,14 +108,26 @@ void MapView3D::initializeGL() {
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);
 
-	// start background update timer
-	timer.start(Settings::MapView::msPerFrame.ms(), this);
-
 	// OpenGL is now initialized
 	isGLInitialized = true;
 
 }
 
+void MapView3D::setVisible(bool visible) {
+
+	// inform parent
+	QOpenGLWidget::setVisible(visible);
+
+	if (!visible) {
+		// stop background update timer
+		timer.stop();
+	} else {
+		// start background update timer
+		timer.start(Settings::MapView3D::msPerFrame.ms(), this);
+	}
+
+}
+
 void MapView3D::paintGL() {
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	draw();

ui/map/3D/MapView3D.h

@@ -140,6 +140,8 @@ public:
 
 	void toggleRenderMode();
 
+	void setVisible(bool visible) override;
+
 public slots:
 
 	void mousePressEvent(QMouseEvent*);

ui/map/3D/elements/ColorPoints.h

@@ -10,6 +10,7 @@
 //#include "../gl/GLTriangles.h"
 #include "../Renderable.h"
 
+#include "../../../../Settings.h"
 #include "../../../../nav/Node.h"
 
 class ColorPoints : public Renderable {
@@ -31,6 +32,9 @@ public:
 
 		points.clear();
 
+		// do not display?
+		if (grid->getNumNodes() > Settings::MapView3D::maxColorPoints) {return;}
+
 		float min = +INFINITY;
 		float max = -INFINITY;
 
@@ -62,6 +66,9 @@ public:
 
 		points.clear();
 
+		// do not display?
+		if (particles.size() > Settings::MapView3D::maxColorPoints) {return;}
+
 		// group particles by grid-point
 		std::unordered_map<GridPoint, float> weights;
 		for (const K::Particle<T>& p : particles) {