Merge branch 'master' of https://git.frank-ebner.de/FHWS/IndoorMap
This commit is contained in:
@@ -22,12 +22,12 @@ INCLUDEPATH += \
|
||||
|
||||
|
||||
SOURCES += \
|
||||
lib/gpc/gpc.cpp \
|
||||
main.cpp \
|
||||
MainWindow.cpp \
|
||||
lib/gpc/gpc.cpp \
|
||||
main.cpp \
|
||||
MainWindow.cpp \
|
||||
MainController.cpp \
|
||||
mapview/2D/tools/ToolSelector.cpp \
|
||||
mapview/2D/tools/Tool.cpp \
|
||||
mapview/2D/tools/ToolSelector.cpp \
|
||||
mapview/2D/tools/Tool.cpp \
|
||||
mapview/MapView2D.cpp \
|
||||
params/ElementParamWidget.cpp \
|
||||
params/LayerParamWidget.cpp \
|
||||
@@ -35,7 +35,7 @@ SOURCES += \
|
||||
params/ToolBox.cpp \
|
||||
mapview/model/MapModel.cpp \
|
||||
tree/MapTreeModel.cpp \
|
||||
mapview/3D/MapView3D.cpp \
|
||||
mapview/3D/MapView3D.cpp \
|
||||
params/StairBuilder.cpp \
|
||||
mapview/2D/tools/Tools.cpp \
|
||||
params/LayerTree.cpp \
|
||||
@@ -62,24 +62,24 @@ HEADERS += MainWindow.h \
|
||||
mapview/model/IHasName.h \
|
||||
mapview/model/IHasObstacleType.h \
|
||||
mapview/model/IHasPosition3D.h \
|
||||
mapview/2D/MV2DElementFloorObstacleLine.h \
|
||||
mapview/2D/MV2DElement.h \
|
||||
mapview/2D/MV2DElementFloorOutlinePolygon.h \
|
||||
mapview/2D/MV2DElementBeacon.h \
|
||||
mapview/2D/MV2DElementAccessPoint.h \
|
||||
mapview/2D/MV2DElementFloorObstacleCircle.h \
|
||||
mapview/2D/MV2DElementFloorObstacleDoor.h \
|
||||
mapview/2D/MapViewElementHelper.h \
|
||||
mapview/2D/MV2DElementFloorUnderlay.h \
|
||||
mapview/2D/MV2DElementPOI.h \
|
||||
mapview/2D/MV2DElementStair.h \
|
||||
mapview/2D/tools/ToolMoveMap.h \
|
||||
mapview/2D/tools/Tools.h \
|
||||
mapview/2D/tools/ToolRuler.h \
|
||||
mapview/2D/tools/ToolMapZoom.h \
|
||||
mapview/2D/tools/ToolSelector.h \
|
||||
mapview/2D/tools/ToolMapGrid.h \
|
||||
mapview/2D/tools/Tool.h \
|
||||
mapview/2D/MV2DElementFloorObstacleLine.h \
|
||||
mapview/2D/MV2DElement.h \
|
||||
mapview/2D/MV2DElementFloorOutlinePolygon.h \
|
||||
mapview/2D/MV2DElementBeacon.h \
|
||||
mapview/2D/MV2DElementAccessPoint.h \
|
||||
mapview/2D/MV2DElementFloorObstacleCircle.h \
|
||||
mapview/2D/MV2DElementFloorObstacleDoor.h \
|
||||
mapview/2D/MapViewElementHelper.h \
|
||||
mapview/2D/MV2DElementFloorUnderlay.h \
|
||||
mapview/2D/MV2DElementPOI.h \
|
||||
mapview/2D/MV2DElementStair.h \
|
||||
mapview/2D/tools/ToolMoveMap.h \
|
||||
mapview/2D/tools/Tools.h \
|
||||
mapview/2D/tools/ToolRuler.h \
|
||||
mapview/2D/tools/ToolMapZoom.h \
|
||||
mapview/2D/tools/ToolSelector.h \
|
||||
mapview/2D/tools/ToolMapGrid.h \
|
||||
mapview/2D/tools/Tool.h \
|
||||
mapview/model/MMFloorObstacleCircle.h \
|
||||
mapview/model/MMFloorObstacleLine.h \
|
||||
mapview/model/MMFloorOutlinePolygon.h \
|
||||
@@ -109,7 +109,7 @@ HEADERS += MainWindow.h \
|
||||
mapview/3D/misc/Polygon.h \
|
||||
mapview/grid/MapView3DGrid.h \
|
||||
mapview/grid/MapModelGrid.h \
|
||||
mapview/3DGrid/GridModel.h \
|
||||
mapview/3DGrid/GridModel.h \
|
||||
mapview/3DGrid/GridRenderer.h \
|
||||
mapview/3DGrid/MyNode.h \
|
||||
mapview/3D/MV3DElementStair.h \
|
||||
@@ -126,8 +126,8 @@ HEADERS += MainWindow.h \
|
||||
mapview/3D/misc/Plane.h \
|
||||
mapview/elements/HasMoveableNodes.h \
|
||||
mapview/2D/MapView2D.h \
|
||||
mapview/2D/Painter.h \
|
||||
mapview/2D/Scaler.h \
|
||||
mapview/2D/Painter.h \
|
||||
mapview/2D/Scaler.h \
|
||||
mapview/2D/MV2DElementElevator.h \
|
||||
mapview/model/MMFloorElevators.h \
|
||||
mapview/model/MMFloorElevator.h \
|
||||
@@ -144,7 +144,10 @@ HEADERS += MainWindow.h \
|
||||
mapview/model/MMFloorFingerprints.h \
|
||||
mapview/model/MMFloorFingerprintLocation.h \
|
||||
mapview/2D/MV2DElementFingerprintLocation.h \
|
||||
mapview/3D/MV3DElementFingerprintLocation.h
|
||||
mapview/3D/MV3DElementFingerprintLocation.h \
|
||||
mapview/model/MMFloorGroundTruthPoints.h \
|
||||
mapview/model/MMFloorGroundTruthPoint.h \
|
||||
mapview/2D/MV2DElementGroundTruthPoint.h
|
||||
|
||||
|
||||
FORMS += MainWindow.ui
|
||||
|
||||
Reference in New Issue
Block a user