a lot!!! of changes

added main menu
added debug display
many debug widgets for plotting live data
worked on android live sensors
added offline-data sensor feeding
some dummy data sensors
worked on the map display
added ui debug for grid-points, particles and weights
added a cool dude to display the estimation
added real filtering based on the Indoor components
c++11 fixes for android compilation
online and offline filtering support
new resampling technique for testing
map loading via dialog

yasmin.pro

@@ -1,10 +1,19 @@
 TEMPLATE = app
 
-QT += qml opengl
+QT += qml opengl svg
 
 # android?
-#QT += androidextras sensors
-#DEFINES += ANDROID
+
+
+# CONFIG+=ANDROID DEFINES+=ANDROID
+ANDROID {
+    QT += androidextras
+    QT += sensors
+}
+
+# debug
+DEFINES += WITH_DEBUG_LOG
+DEFINES += WITH_ASSERTIONS
 
 CONFIG += c++11
 
@@ -12,7 +21,13 @@ CONFIG += c++11
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/_android
 
 INCLUDEPATH += \
-	../
+    ../ \
+    ./lib/
+
+
+# linux desktop wifi
+#INCLUDEPATH +=/usr/include/libnl3/
+#LIBS += -lnl-genl-3 -lnl-3
 
 OTHER_FILES += \
 	_android/src/WiFi.java \
@@ -21,15 +36,24 @@ OTHER_FILES += \
 
 SOURCES += \
 	main.cpp \
-    map/MapView.cpp \
-	map/Geometry.cpp \
-	lib/gpc/gpc.cpp \
-	../Indoor/lib/tinyxml/tinyxml2.cpp
+    lib/gpc/gpc.cpp \
+	../Indoor/lib/tinyxml/tinyxml2.cpp \
+    ui/map/MapView.cpp \
+    ui/menu/MainMenu.cpp \
+    ui/MainWindow.cpp \
+    Controller.cpp \
+    ui/dialog/LoadSetupDialog.cpp \
+    ui/debug/SensorDataWidget.cpp \
+    ui/debug/plot/PlottWidget.cpp \
+    ui/debug/PlotTurns.cpp \
+    ui/debug/PlotWiFiScan.cpp \
+    sensors/android/WiFiSensorAndroid.cpp \
+    sensors/linux/WiFiSensorLinuxC.c
 
 RESOURCES += qml.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
+#QML_IMPORT_PATH =
 
 # Default rules for deployment.
 include(deployment.pri)
@@ -46,24 +70,69 @@ HEADERS += \
     sensors/linux/WiFiSensorLinux.h \
     sensors/android/WiFiSensorAndroid.h \
     sensors/StepSensor.h \
+    sensors/TurnSensor.h \
     sensors/AccelerometerSensor.h \
+    sensors/GyroscopeSensor.h \
+    sensors/BarometerSensor.h \
     sensors/android/AccelerometerSensorAndroid.h \
+    sensors/android/GyroscopeSensorAndroid.h \
+    sensors/android/BarometerSensorAndroid.h \
     sensors/dummy/AccelerometerSensorDummy.h \
+    sensors/dummy/GyroscopeSensorDummy.h \
+    sensors/dummy/BarometerSensorDummy.h \
     sensors/Sensor.h \
     sensors/SensorFactory.h \
     sensors/WiFiSensor.h \
 	misc/Debug.h \
 	misc/fixc11.h \
     sensors/dummy/WiFiSensorDummy.h \
-    map/MapView.h \
-    map/Geometry.h \
-    map/FloorRenderer.h \
-    map/Ground.h \
     lib/gpc/Polygon.h \
-    map/GL.h \
-    Stairs.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/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 \
+    ui/debug/plot/Data.h \
+    ui/debug/plot/Range.h \
+    nav/NavController.h \
+    sensors/dummy/RandomSensor.h \
+    ui/debug/SensorDataWidget.h \
+    ui/debug/plot/PlottWidget.h \
+    ui/debug/PlotTurns.h \
+    ui/debug/PlotWiFiScan.h \
+    nav/State.h \
+    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
 
 DISTFILES += \
     android-sources/src/MyActivity.java \
 	res/gl/vertex1.glsl \
-	res/gl/fragment1.glsl
+	res/gl/fragment1.glsl \
+    res/gl/tex/empty_normals.jpg