current revision

yasmin.pro

@@ -11,12 +11,19 @@ ANDROID {
     QT += sensors
 }
 
+# openMP
+QMAKE_CXXFLAGS += -fopenmp
+LIBS += -fopenmp
+
 # debug
 DEFINES += WITH_DEBUG_LOG
 DEFINES += WITH_ASSERTIONS
 
+QMAKE_CXXFLAGS += -Werror=return-type
+
 CONFIG += c++11
 
+
 # use files in ./_android for the project as well
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/_android
 
@@ -38,7 +45,6 @@ SOURCES += \
 	main.cpp \
     lib/gpc/gpc.cpp \
 	../Indoor/lib/tinyxml/tinyxml2.cpp \
-    ui/map/MapView.cpp \
     ui/menu/MainMenu.cpp \
     ui/MainWindow.cpp \
     Controller.cpp \
@@ -48,7 +54,11 @@ SOURCES += \
     ui/debug/PlotTurns.cpp \
     ui/debug/PlotWiFiScan.cpp \
     sensors/android/WiFiSensorAndroid.cpp \
-    sensors/linux/WiFiSensorLinuxC.c
+    sensors/linux/WiFiSensorLinuxC.c \
+    ui/debug/InfoWidget.cpp \
+    ui/map/3D/MapView3D.cpp \
+    ui/map/2D/MapView2D.cpp \
+    tools/calibration/WiFiCalibrationScanDialog.cpp
 
 RESOURCES += qml.qrc
 
@@ -87,24 +97,27 @@ HEADERS += \
 	misc/fixc11.h \
     sensors/dummy/WiFiSensorDummy.h \
     lib/gpc/Polygon.h \
-    Stairs.h \
-    ui/map/MapView.h \
-    ui/map/FloorRenderer.h \
-    ui/map/gl/GL.h \
-    ui/map/gl/GLHelper.h \
-    ui/map/gl/GLLines.h \
-    ui/map/gl/GLTriangles.h \
-    ui/map/elements/Doors.h \
-    ui/map/elements/Ground.h \
-    ui/map/elements/Handrails.h \
-    ui/map/elements/Path.h \
-    ui/map/elements/Stairs.h \
-    ui/map/elements/Walls.h \
+    ui/map/3D/FloorRenderer.h \
+    ui/map/3D/gl/GL.h \
+    ui/map/3D/gl/GLHelper.h \
+    ui/map/3D/gl/GLLines.h \
+    ui/map/3D/gl/GLTriangles.h \
+    ui/map/3D/elements/Doors.h \
+    ui/map/3D/elements/Ground.h \
+    ui/map/3D/elements/Handrails.h \
+    ui/map/3D/elements/Path.h \
+    ui/map/3D/elements/Stairs.h \
+    ui/map/3D/elements/Walls.h \
+    ui/map/3D/gl/GLPoints.h \
+    ui/map/3D/elements/ColorPoints.h \
+    ui/map/3D/RenderParams.h \
+    ui/map/3D/Renderable.h \
+    ui/map/3D/gl/Shader.h \
+    ui/map/3D/elements/Object.h \
     ui/Icons.h \
     ui/MainWindow.h \
     Controller.h \
     ui/menu/MainMenu.h \
-    Config.h \
     ui/dialog/LoadSetupDialog.h \
     ui/debug/plot/Axes.h \
     ui/debug/plot/Plot.h \
@@ -120,19 +133,42 @@ HEADERS += \
     nav/Filter.h \
     nav/Node.h \
     sensors/linux/WiFiSensorLinuxC.h \
-    ui/map/gl/GLPoints.h \
-    ui/map/elements/ColorPoints.h \
     sensors/offline/SensorFactoryOffline.h \
     sensors/dummy/SensorFactoryDummy.h \
     sensors/android/SensorFactoryAndroid.h \
-    ui/map/gl/Shader.h \
-    ui/map/elements/Object.h \
     Settings.h \
     nav/RegionalResampling.h \
-    sensors/offline/AllInOneSensor.h
+    sensors/offline/AllInOneSensor.h \
+    sensors/ActivitySensor.h \
+    ui/LoggerUI.h \
+    ui/debug/InfoWidget.h \
+    ui/UIHelper.h \
+    nav/NodeResampling.h \
+    ui/map/3D/MapView3D.h \
+    ui/map/2D/MapView2D.h \
+    ui/map/2D/Floor2D.h \
+    ui/map/2D/Scaler2D.h \
+    ui/map/2D/Renderable2D.h \
+    ui/map/2D/RenderParams2D.h \
+    ui/map/2D/ColorPoints2D.h \
+    ui/map/2D/Path2D.h \
+    ui/map/2D/WiFiCalibTool.h \
+    ui/map/2D/HasSelectableNodes.h \
+    tools/calibration/WiFiCalibrationDataModel.h \
+    tools/calibration/WiFiCalibrationScanDialog.h \
+    tests/RuntimeTests.h \
+    ipin/StepLogger.h \
+    ipin/Scaler.h \
+    ipin/Config.h \
+    ipin/IPINHelper.h \
+    nav/NavControllerListener.h \
+    ipin/StepLoggerWrapper.h \
+    ipin/StepLoggerWrapperAndroid.h
 
 DISTFILES += \
     android-sources/src/MyActivity.java \
 	res/gl/vertex1.glsl \
 	res/gl/fragment1.glsl \
-    res/gl/tex/empty_normals.jpg
+    res/gl/tex/empty_normals.jpg \
+    _android/src/aidl/it/cnr/isti/steplogger/IStepLoggerService.aidl \
+    _android/src/StepLoggerClient.java