FHWS/IndoorMap
Archived
2
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

a whole lotta work!!

Browse Source 
- refactoring
- completely changed the tooling (adding elements)
- better re-use for more stable editing
- new elements
- ui adjustments
- LINT for stair-editing
- many more changes
This commit is contained in:
FrankE
2016-08-29 19:05:46 +02:00
parent 86c76b1284
commit fa06320219
51 changed files with 880 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mapview/model/MMFloorAccessPoint.h
View File

@@ -4,7 +4,7 @@
#include "MapModelElement.h"
#include "IHasParams.h"
#include "../elements/MV2DElementAccessPoint.h"
#include "../2D/MV2DElementAccessPoint.h"
#include "../3D/MV3DElementAccessPoint.h"
#include <Indoor/floorplan/v2/Floorplan.h>

2
mapview/model/MMFloorBeacon.h
View File

@@ -4,7 +4,7 @@
#include "MapModelElement.h"
#include "IHasParams.h"
#include "../elements/MV2DElementBeacon.h"
#include "../2D/MV2DElementBeacon.h"
#include <Indoor/floorplan/v2/Floorplan.h>

4
mapview/model/MMFloorObstacleCircle.h
View File

@@ -3,12 +3,12 @@
#include "MapModelElement.h"
#include "../elements/MapViewElementHelper.h"
#include "../2D/MapViewElementHelper.h"
#include "IHasMaterial.h"
#include "IHasObstacleType.h"
#include "../elements/MV2DElementFloorObstacleCircle.h"
#include "../2D/MV2DElementFloorObstacleCircle.h"
#include <Indoor/floorplan/v2/Floorplan.h>

4
mapview/model/MMFloorObstacleDoor.h
View File

@@ -2,13 +2,13 @@
#define MMFLOOROBSTACLEDOOR_H
#include "MapModelElement.h"
#include "../elements/MapViewElementHelper.h"
#include "../2D/MapViewElementHelper.h"
#include "IHasMaterial.h"
#include "IHasDoorType.h"
#include "IHasParams.h"
#include "../elements/MV2DElementFloorObstacleDoor.h"
#include "../2D/MV2DElementFloorObstacleDoor.h"
#include "../3D/MV3DElementFloorObstacleDoor.h"
#include <Indoor/floorplan/v2/Floorplan.h>

4
mapview/model/MMFloorObstacleLine.h
View File

@@ -2,12 +2,12 @@
#define MAPELEMENTOBSTACLE_H
#include "MapModelElement.h"
#include "../elements/MapViewElementHelper.h"
#include "../2D/MapViewElementHelper.h"
#include "IHasMaterial.h"
#include "IHasObstacleType.h"
#include "../elements/MV2DElementFloorObstacleLine.h"
#include "../2D/MV2DElementFloorObstacleLine.h"
#include "../3D/MV3DElementFloorObstacleWall.h"
#include <Indoor/floorplan/v2/Floorplan.h>

12
mapview/model/MMFloorObstacles.h
View File

@@ -39,24 +39,28 @@ public:
Floorplan::Floor* getFloor() {return floor;}
//TODO: check
void createDoor(Floorplan::FloorObstacleDoor* obs) {
MMFloorObstacleDoor* createDoor(Floorplan::FloorObstacleDoor* obs) {
// add to underlying model
floor->obstacles.push_back(obs);
// add to myself as element
elements.push_back(new MMFloorObstacleDoor(this, floor, obs));
MMFloorObstacleDoor* mm = new MMFloorObstacleDoor(this, floor, obs);
elements.push_back(mm);
return mm;
}
//TODO: check
void createLine(Floorplan::FloorObstacleLine* obs) {
MMFloorObstacleLine* createLine(Floorplan::FloorObstacleLine* obs) {
// add to underlying model
floor->obstacles.push_back(obs);
// add to myself as element
elements.push_back(new MMFloorObstacleLine(this, floor, obs));
MMFloorObstacleLine* mm = new MMFloorObstacleLine(this, floor, obs);
elements.push_back(mm);
return mm;
}

2
mapview/model/MMFloorOutlinePolygon.h
View File

@@ -4,7 +4,7 @@
#include "IHasParams.h"
#include "MapModelElement.h"
#include "../elements/MV2DElementFloorOutlinePolygon.h"
#include "../2D/MV2DElementFloorOutlinePolygon.h"
#include "../3D/MV3DElementFloorOutlinePolygon.h"
#include <Indoor/floorplan/v2/Floorplan.h>

2
mapview/model/MMFloorPOI.h
View File

@@ -4,7 +4,7 @@
#include "MapModelElement.h"
#include "IHasParams.h"
#include "../elements/MV2DElementPOI.h"
#include "../2D/MV2DElementPOI.h"
#include <Indoor/floorplan/v2/Floorplan.h>

2
mapview/model/MMFloorStair.h
View File

@@ -5,7 +5,7 @@
#include "IHasParams.h"
#include "MMFloorOutlinePolygon.h"
#include "../elements/MV2DElementStair.h"
#include "../2D/MV2DElementStair.h"
#include "../3D/MV3DElementStair.h"

2
mapview/model/MMFloorUnderlayImage.h
View File

@@ -5,7 +5,7 @@
#include "IHasParams.h"
#include "MapModelElement.h"
#include "../elements/MV2DElementFloorUnderlay.h"
#include "../2D/MV2DElementFloorUnderlay.h"
#include <Indoor/floorplan/v2/Floorplan.h>
/**

2
mapview/model/MMFloorUnderlays.h
View File

@@ -3,7 +3,7 @@
#include "MMFloorUnderlayImage.h"
#include "../elements/MV2DElementFloorUnderlay.h"
#include "../2D/MV2DElementFloorUnderlay.h"
#include <Indoor/floorplan/v2/Floorplan.h>