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

split line(old) and wall(new)

Browse Source 
added new walling
started working on windows
This commit is contained in:
k-a-z-u
2018-07-25 16:20:34 +02:00
parent 4938987063
commit 8017241c6e
14 changed files with 703 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mapview/model/MMFloorObstacles.h
View File

@@ -4,6 +4,7 @@
#include "MapLayer.h"
#include "MMFloorObstacleCircle.h"
#include "MMFloorObstacleLine.h"
#include "MMFloorObstacleWall.h"
#include "MMFloorObstacleDoor.h"
#include "MMFloorObstacleObject.h"
@@ -25,12 +26,14 @@ public:
for (Floorplan::FloorObstacle* o : floor->obstacles) {
if (dynamic_cast<Floorplan::FloorObstacleLine*>(o)) {
addElement(new MMFloorObstacleLine(this, floor, (Floorplan::FloorObstacleLine*)o));
} else if (dynamic_cast<Floorplan::FloorObstacleWall*>(o)) {
addElement(new MMFloorObstacleWall(this, floor, (Floorplan::FloorObstacleWall*)o));
} else if (dynamic_cast<Floorplan::FloorObstacleCircle*>(o)) {
addElement(new MMFloorObstacleCircle(this, floor, (Floorplan::FloorObstacleCircle*)o));
} else if (dynamic_cast<Floorplan::FloorObstacleDoor*>(o)) {
addElement(new MMFloorObstacleDoor(this, floor, (Floorplan::FloorObstacleDoor*)o));
addElement(new MMFloorObstacleDoor(this, floor, (Floorplan::FloorObstacleDoor*)o));
} else if (dynamic_cast<Floorplan::FloorObstacleObject*>(o)) {
addElement(new MMFloorObstacleObject(this, floor, (Floorplan::FloorObstacleObject*)o));
addElement(new MMFloorObstacleObject(this, floor, (Floorplan::FloorObstacleObject*)o));
} else {
throw new Exception("todo: not yet implemented obstacle type");
}
@@ -50,6 +53,21 @@ public:
/** get the corresponding floor from the underlying model */
Floorplan::Floor* getFloor() {return floor;}
//TODO: check
MMFloorObstacleWall* createWall(Floorplan::FloorObstacleWall* obs) {
// add to underlying model
floor->obstacles.push_back(obs);
// add to myself as element
MMFloorObstacleWall* mm = new MMFloorObstacleWall(this, floor, obs);
addElement(mm);
return mm;
}
//TODO: check
MMFloorObstacleDoor* createDoor(Floorplan::FloorObstacleDoor* obs) {