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

adjusted some models due to indoor changes

Browse Source
This commit is contained in:
k-a-z-u
2017-07-27 18:41:48 +02:00
parent b0c152c5dc
commit 6f06984c4e
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mapview/model/MMFloor.h
View File

@@ -44,7 +44,7 @@ public:
new MMFloorBeacons(this, floor);
new MMFloorFingerprints(this, floor);
new MMFloorPOIs(this, floor);
new MMFloorStairs(this, floor);
new MMFloorStairs(this, map, floor);
new MMFloorElevators(this, floor);
new MMFloorGroundTruthPoints(this, floor);

4
mapview/model/MMFloorStair.h
View File

@@ -28,8 +28,8 @@ private:
public:
/** ctor with the underlying model */
MMFloorStair(MapLayer* parent, Floorplan::Floor* floor, Floorplan::StairFreeform* stair) :
MapModelElement(parent), floor(floor), stair(stair), mv2d(floor, stair), mv3d(floor, stair) {
MMFloorStair(MapLayer* parent, Floorplan::IndoorMap* map, Floorplan::Floor* floor, Floorplan::StairFreeform* stair) :
MapModelElement(parent), floor(floor), stair(stair), mv2d(map, floor, stair), mv3d(floor, stair) {
;

7
mapview/model/MMFloorStairs.h
View File

@@ -13,17 +13,18 @@ class MMFloorStairs : public MapLayer {
private:
Floorplan::IndoorMap* map;
Floorplan::Floor* floor;
public:
/** ctor with the underlying model */
MMFloorStairs(MapLayer* parent, Floorplan::Floor* floor) : MapLayer(parent, MapLayerType::FLOOR_STAIRS), floor(floor) {
MMFloorStairs(MapLayer* parent, Floorplan::IndoorMap* map, Floorplan::Floor* floor) : MapLayer(parent, MapLayerType::FLOOR_STAIRS), map(map), floor(floor) {
// add all floors
for (Floorplan::Stair* stair : floor->stairs) {
if (dynamic_cast<Floorplan::StairFreeform*>(stair)) {
addElement( new MMFloorStair(this, floor, (Floorplan::StairFreeform*)stair) );
addElement( new MMFloorStair(this, map, floor, (Floorplan::StairFreeform*)stair) );
}
}
@@ -35,7 +36,7 @@ public:
floor->stairs.push_back(stair);
// add to myself as element
MMFloorStair* mm = new MMFloorStair(this, floor, stair);
MMFloorStair* mm = new MMFloorStair(this, map, floor, stair);
addElement(mm);
return mm;