merged
This commit is contained in:
21
mapview/model/IHasEditableMeta.h
Normal file
21
mapview/model/IHasEditableMeta.h
Normal file
@@ -0,0 +1,21 @@
|
||||
#ifndef IHASEDITABLEMETA_H
|
||||
#define IHASEDITABLEMETA_H
|
||||
|
||||
#include <Indoor/floorplan/v2/Floorplan.h>
|
||||
|
||||
/**
|
||||
* interface for all classes that provide editable meta information
|
||||
*/
|
||||
class IHasEditableMeta {
|
||||
|
||||
public:
|
||||
|
||||
/** get the meta-information object [if any] */
|
||||
virtual Floorplan::Meta* getMeta() = 0;
|
||||
|
||||
/** set/overwrite the meta-information object */
|
||||
virtual void setMeta(Floorplan::Meta* meta) = 0;
|
||||
|
||||
};
|
||||
|
||||
#endif // IHASEDITABLEMETA_H
|
||||
@@ -26,16 +26,18 @@ class MMFloor : public MapLayer, public IHasParams {
|
||||
|
||||
private:
|
||||
|
||||
Floorplan::IndoorMap* map;
|
||||
|
||||
/** the underlying data-structure */
|
||||
Floorplan::Floor* floor;
|
||||
|
||||
public:
|
||||
|
||||
/** ctor. existing floor */
|
||||
MMFloor(MapLayer* parent, Floorplan::Floor* floor) : MapLayer(parent, MapLayerType::FLOOR), floor(floor) {
|
||||
MMFloor(MapLayer* parent, Floorplan::IndoorMap* map, Floorplan::Floor* floor) : MapLayer(parent, MapLayerType::FLOOR), map(map), floor(floor) {
|
||||
|
||||
new MMFloorUnderlays(this, floor);
|
||||
elements.push_back(new MMFloorOutline(this, floor));
|
||||
new MMFloorOutline(this, floor);
|
||||
new MMFloorObstacles(this, floor);
|
||||
new MMFloorAccessPoints(this, floor);
|
||||
new MMFloorBeacons(this, floor);
|
||||
@@ -58,12 +60,14 @@ public:
|
||||
std::string getLayerName() const override {return floor->name;}
|
||||
|
||||
virtual int getNumParams() const override {
|
||||
return 1;
|
||||
return 3;
|
||||
}
|
||||
|
||||
virtual Param getParamDesc(const int idx) const override {
|
||||
switch(idx) {
|
||||
case 0: return Param("anem", ParamType::STRING);
|
||||
case 0: return Param("name", ParamType::STRING);
|
||||
case 1: return Param("height", ParamType::FLOAT);
|
||||
case 2: return Param("at height", ParamType::FLOAT);
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
@@ -71,6 +75,8 @@ public:
|
||||
virtual ParamValue getParamValue(const int idx) const override {
|
||||
switch(idx) {
|
||||
case 0: return floor->name;
|
||||
case 1: return floor->height;
|
||||
case 2: return floor->atHeight;
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
@@ -78,9 +84,16 @@ public:
|
||||
virtual void setParamValue(const int idx, const ParamValue& val) const override {
|
||||
switch(idx) {
|
||||
case 0: floor->name = val.toString(); break;
|
||||
case 1: floor->height = val.toFloat(); break;
|
||||
case 2: floor->atHeight = val.toFloat(); break;
|
||||
}
|
||||
}
|
||||
|
||||
void deleteMe() {
|
||||
parent->removeSublayer(this);
|
||||
map->floors.erase(std::remove(map->floors.begin(), map->floors.end(), floor), map->floors.end());
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#endif // MMFLOOR_H
|
||||
|
||||
@@ -3,13 +3,14 @@
|
||||
|
||||
#include "MapModelElement.h"
|
||||
#include "IHasParams.h"
|
||||
#include "IHasEditableMeta.h"
|
||||
|
||||
#include "../2D/MV2DElementAccessPoint.h"
|
||||
#include "../3D/MV3DElementAccessPoint.h"
|
||||
|
||||
#include <Indoor/floorplan/v2/Floorplan.h>
|
||||
|
||||
class MMFloorAccessPoint : public MapModelElement, public IHasParams {
|
||||
class MMFloorAccessPoint : public MapModelElement, public IHasParams, public IHasEditableMeta {
|
||||
|
||||
private:
|
||||
|
||||
@@ -26,7 +27,7 @@ public:
|
||||
}
|
||||
|
||||
virtual int getNumParams() const override {
|
||||
return 3;
|
||||
return 6;
|
||||
}
|
||||
|
||||
virtual Param getParamDesc(const int idx) const override {
|
||||
@@ -34,6 +35,9 @@ public:
|
||||
case 0: return Param("name", ParamType::STRING);
|
||||
case 1: return Param("MAC", ParamType::STRING);
|
||||
case 2: return Param("Position", ParamType::POINT3);
|
||||
case 3: return Param("TXP", ParamType::FLOAT);
|
||||
case 4: return Param("EXP", ParamType::FLOAT);
|
||||
case 5: return Param("WAF", ParamType::FLOAT);
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
@@ -43,6 +47,9 @@ public:
|
||||
case 0: return ap->name;
|
||||
case 1: return ap->mac;
|
||||
case 2: return ap->pos;
|
||||
case 3: return ap->model.txp;
|
||||
case 4: return ap->model.exp;
|
||||
case 5: return ap->model.waf;
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
@@ -52,9 +59,20 @@ public:
|
||||
case 0: ap->name = val.toString(); break;
|
||||
case 1: ap->mac = val.toString(); break;
|
||||
case 2: ap->pos = val.toPoint3(); break;
|
||||
case 3: ap->model.txp = val.toFloat(); break;
|
||||
case 4: ap->model.exp = val.toFloat(); break;
|
||||
case 5: ap->model.waf = val.toFloat(); break;
|
||||
}
|
||||
}
|
||||
|
||||
virtual Floorplan::Meta* getMeta() override {
|
||||
return ap->getMeta();
|
||||
}
|
||||
|
||||
virtual void setMeta(Floorplan::Meta* meta) override {
|
||||
ap->setMeta(meta);
|
||||
}
|
||||
|
||||
MV2DElement* getMV2D() const override {return (MV2DElement*) &mv2d;}
|
||||
MV3DElement* getMV3D() const override {return (MV3DElement*) &mv3d;}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
|
||||
// add all APs
|
||||
for (Floorplan::AccessPoint* ap : floor->accesspoints) {
|
||||
elements.push_back(new MMFloorAccessPoint(this, floor, ap));
|
||||
addElement(new MMFloorAccessPoint(this, floor, ap));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
floor->accesspoints.push_back(ap);
|
||||
|
||||
// add to myself as element
|
||||
elements.push_back(new MMFloorAccessPoint(this, floor, ap));
|
||||
addElement(new MMFloorAccessPoint(this, floor, ap));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -23,14 +23,20 @@ public:
|
||||
}
|
||||
|
||||
virtual int getNumParams() const override {
|
||||
return 3;
|
||||
return 9;
|
||||
}
|
||||
|
||||
virtual Param getParamDesc(const int idx) const override {
|
||||
switch(idx) {
|
||||
case 0: return Param("name", ParamType::STRING);
|
||||
case 1: return Param("MAC", ParamType::STRING);
|
||||
case 2: return Param("Position", ParamType::POINT3);
|
||||
case 1: return Param("Position", ParamType::POINT3);
|
||||
case 2: return Param("MAC", ParamType::STRING);
|
||||
case 3: return Param("major", ParamType::STRING);
|
||||
case 4: return Param("minor", ParamType::STRING);
|
||||
case 5: return Param("UUDI", ParamType::STRING);
|
||||
case 6: return Param("TXP", ParamType::FLOAT);
|
||||
case 7: return Param("EXP", ParamType::FLOAT);
|
||||
case 8: return Param("WAF", ParamType::FLOAT);
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
@@ -38,8 +44,14 @@ public:
|
||||
virtual ParamValue getParamValue(const int idx) const override {
|
||||
switch(idx) {
|
||||
case 0: return b->name;
|
||||
case 1: return b->mac;
|
||||
case 2: return b->pos;
|
||||
case 1: return b->pos;
|
||||
case 2: return b->mac;
|
||||
case 3: return b->major;
|
||||
case 4: return b->minor;
|
||||
case 5: return b->uuid;
|
||||
case 6: return b->model.txp;
|
||||
case 7: return b->model.exp;
|
||||
case 8: return b->model.waf;
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
@@ -47,8 +59,14 @@ public:
|
||||
virtual void setParamValue(const int idx, const ParamValue& val) const override {
|
||||
switch(idx) {
|
||||
case 0: b->name = val.toString(); break;
|
||||
case 1: b->mac = val.toString(); break;
|
||||
case 2: b->pos = val.toPoint3(); break;
|
||||
case 1: b->pos = val.toPoint3(); break;
|
||||
case 2: b->mac = val.toString(); break;
|
||||
case 3: b->major = val.toString(); break;
|
||||
case 4: b->minor = val.toString(); break;
|
||||
case 5: b->uuid = val.toString(); break;
|
||||
case 6: b->uuid = val.toFloat(); break;
|
||||
case 7: b->uuid = val.toFloat(); break;
|
||||
case 8: b->uuid = val.toFloat(); break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
|
||||
// add all Beacons
|
||||
for (Floorplan::Beacon* b : floor->beacons) {
|
||||
elements.push_back(new MMFloorBeacon(this, floor, b));
|
||||
addElement(new MMFloorBeacon(this, floor, b));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
floor->beacons.push_back(b);
|
||||
|
||||
// add to myself as element
|
||||
elements.push_back(new MMFloorBeacon(this, floor, b));
|
||||
addElement(new MMFloorBeacon(this, floor, b));
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
@@ -23,7 +23,7 @@ public:
|
||||
|
||||
// add all elevators
|
||||
for (Floorplan::Elevator* elevator : floor->elevators) {
|
||||
elements.push_back(new MMFloorElevator(this, floor, elevator));
|
||||
addElement(new MMFloorElevator(this, floor, elevator));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
floor->elevators.push_back(elevator);
|
||||
|
||||
// add to myself as element
|
||||
elements.push_back(new MMFloorElevator(this, floor, elevator));
|
||||
addElement(new MMFloorElevator(this, floor, elevator));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include "IHasMaterial.h"
|
||||
#include "IHasObstacleType.h"
|
||||
#include "IHasParams.h"
|
||||
|
||||
#include "../2D/MV2DElementFloorObstacleLine.h"
|
||||
#include "../3D/MV3DElementFloorObstacleWall.h"
|
||||
@@ -13,7 +14,7 @@
|
||||
#include <Indoor/floorplan/v2/Floorplan.h>
|
||||
|
||||
|
||||
class MMFloorObstacleLine : public MapModelElement, public IHasMaterial, public IHasObstacleType {
|
||||
class MMFloorObstacleLine : public MapModelElement, public IHasMaterial, public IHasObstacleType, public IHasParams {
|
||||
|
||||
public:
|
||||
|
||||
@@ -43,6 +44,31 @@ public:
|
||||
mf->obstacles.erase(std::remove(mf->obstacles.begin(), mf->obstacles.end(), fo), mf->obstacles.end());
|
||||
}
|
||||
|
||||
|
||||
virtual int getNumParams() const override {
|
||||
return 1;
|
||||
}
|
||||
|
||||
virtual Param getParamDesc(const int idx) const override {
|
||||
switch(idx) {
|
||||
case 0: return Param("length", ParamType::FLOAT, true);
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
|
||||
virtual ParamValue getParamValue(const int idx) const override {
|
||||
switch(idx) {
|
||||
case 0: return fo->from.getDistance(fo->to);
|
||||
}
|
||||
throw 1;
|
||||
}
|
||||
|
||||
virtual void setParamValue(const int idx, const ParamValue& val) const override {
|
||||
switch(idx) {
|
||||
case 0: break;
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#endif // MAPELEMENTOBSTACLE_H
|
||||
|
||||
@@ -23,11 +23,11 @@ public:
|
||||
// the obstacles
|
||||
for (Floorplan::FloorObstacle* o : floor->obstacles) {
|
||||
if (dynamic_cast<Floorplan::FloorObstacleLine*>(o)) {
|
||||
elements.push_back(new MMFloorObstacleLine(this, floor, (Floorplan::FloorObstacleLine*)o));
|
||||
addElement(new MMFloorObstacleLine(this, floor, (Floorplan::FloorObstacleLine*)o));
|
||||
} else if (dynamic_cast<Floorplan::FloorObstacleCircle*>(o)) {
|
||||
elements.push_back(new MMFloorObstacleCircle(this, floor, (Floorplan::FloorObstacleCircle*)o));
|
||||
addElement(new MMFloorObstacleCircle(this, floor, (Floorplan::FloorObstacleCircle*)o));
|
||||
} else if (dynamic_cast<Floorplan::FloorObstacleDoor*>(o)) {
|
||||
elements.push_back(new MMFloorObstacleDoor(this, floor, (Floorplan::FloorObstacleDoor*)o));
|
||||
addElement(new MMFloorObstacleDoor(this, floor, (Floorplan::FloorObstacleDoor*)o));
|
||||
} else {
|
||||
throw new Exception("todo: not yet implemented obstacle type");
|
||||
}
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
|
||||
// add to myself as element
|
||||
MMFloorObstacleDoor* mm = new MMFloorObstacleDoor(this, floor, obs);
|
||||
elements.push_back(mm);
|
||||
addElement(mm);
|
||||
return mm;
|
||||
|
||||
}
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
|
||||
// add to myself as element
|
||||
MMFloorObstacleLine* mm = new MMFloorObstacleLine(this, floor, obs);
|
||||
elements.push_back(mm);
|
||||
addElement(mm);
|
||||
return mm;
|
||||
|
||||
}
|
||||
@@ -71,7 +71,7 @@ public:
|
||||
floor->obstacles.push_back(obs);
|
||||
|
||||
// add to myself as element
|
||||
elements.push_back(new MMFloorObstacleCircle(this, floor, obs));
|
||||
addElement(new MMFloorObstacleCircle(this, floor, obs));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -3,37 +3,38 @@
|
||||
|
||||
#include "MapLayer.h"
|
||||
#include "MMFloorOutlinePolygon.h"
|
||||
#include "../3D/MV3DElementFloorOutline.h"
|
||||
#include "MMFloorOutlinePolygonCombined.h"
|
||||
|
||||
#include "../3D/MV3DElementFloorOutline.h"
|
||||
|
||||
#include <Indoor/floorplan/v2/Floorplan.h>
|
||||
|
||||
/**
|
||||
* layer containing all elements describing a floor's outline
|
||||
*/
|
||||
class MMFloorOutline : public MapLayer, public MapModelElement {
|
||||
class MMFloorOutline : public MapLayer {
|
||||
|
||||
private:
|
||||
|
||||
/** the underlying model */
|
||||
Floorplan::Floor* floor;
|
||||
|
||||
MV3DElementFloorOutline mv3d;
|
||||
|
||||
public:
|
||||
|
||||
/** ctor with the underlying model */
|
||||
MMFloorOutline(MapLayer* parent, Floorplan::Floor* floor) :
|
||||
MapLayer(parent, MapLayerType::FLOOR_GROUND), MapModelElement(parent), floor(floor), mv3d(floor, &floor->outline) {
|
||||
MapLayer(parent, MapLayerType::FLOOR_GROUND), floor(floor) {
|
||||
|
||||
// the outline
|
||||
// each polygon that is part of the outline
|
||||
for (Floorplan::FloorOutlinePolygon* poly : floor->outline) {
|
||||
elements.push_back(new MMFloorOutlinePolygon(this, floor, poly));
|
||||
addElement(new MMFloorOutlinePolygon(this, floor, poly));
|
||||
}
|
||||
|
||||
}
|
||||
// for 3D, alle polygons [add/remove] are combined into one renderable polygons
|
||||
addElement(new MMFloorOutlinePolygonCombined(this, floor));
|
||||
|
||||
MV3DElement* getMV3D() const override {return (MV3DElement*) &mv3d;}
|
||||
}
|
||||
|
||||
|
||||
/** get the corresponding floor from the underlying model */
|
||||
@@ -46,7 +47,7 @@ public:
|
||||
floor->outline.push_back(poly);
|
||||
|
||||
// add to myself as element
|
||||
elements.push_back(new MMFloorOutlinePolygon(this, floor, poly));
|
||||
addElement(new MMFloorOutlinePolygon(this, floor, poly));
|
||||
|
||||
}
|
||||
|
||||
|
||||
41
mapview/model/MMFloorOutlinePolygonCombined.h
Normal file
41
mapview/model/MMFloorOutlinePolygonCombined.h
Normal file
@@ -0,0 +1,41 @@
|
||||
#ifndef MMFLOOROUTLINEPOLYGONCOMBINED_H
|
||||
#define MMFLOOROUTLINEPOLYGONCOMBINED_H
|
||||
|
||||
#include "MapLayer.h"
|
||||
#include "MMFloorOutlinePolygon.h"
|
||||
#include "../3D/MV3DElementFloorOutline.h"
|
||||
|
||||
|
||||
#include <Indoor/floorplan/v2/Floorplan.h>
|
||||
|
||||
/**
|
||||
* this element combines all polygons of one layer
|
||||
* into one large, 3D renderable polygon
|
||||
*/
|
||||
class MMFloorOutlinePolygonCombined : public MapModelElement {
|
||||
|
||||
private:
|
||||
|
||||
/** the underlying model */
|
||||
Floorplan::Floor* floor;
|
||||
|
||||
MV3DElementFloorOutline mv3d;
|
||||
|
||||
public:
|
||||
|
||||
/** ctor with the underlying model */
|
||||
MMFloorOutlinePolygonCombined(MapLayer* parent, Floorplan::Floor* floor) :
|
||||
MapModelElement(parent), floor(floor), mv3d(floor, &floor->outline) {
|
||||
|
||||
;
|
||||
|
||||
}
|
||||
|
||||
MV3DElement* getMV3D() const override {return (MV3DElement*) &mv3d;}
|
||||
|
||||
/** get the corresponding floor from the underlying model */
|
||||
Floorplan::Floor* getFloor() {return floor;}
|
||||
|
||||
};
|
||||
|
||||
#endif // MMFLOOROUTLINEPOLYGONCOMBINED_H
|
||||
@@ -20,7 +20,7 @@ public:
|
||||
|
||||
// the POIs
|
||||
for (Floorplan::POI* poi : floor->pois) {
|
||||
elements.push_back(new MMFloorPOI(this, floor, poi));
|
||||
addElement(new MMFloorPOI(this, floor, poi));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
floor->pois.push_back(poi);
|
||||
|
||||
// add to myself as element
|
||||
elements.push_back(new MMFloorPOI(this, floor, poi));
|
||||
addElement(new MMFloorPOI(this, floor, poi));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ public:
|
||||
// add all floors
|
||||
for (Floorplan::Stair* stair : floor->stairs) {
|
||||
if (dynamic_cast<Floorplan::StairFreeform*>(stair)) {
|
||||
elements.push_back( new MMFloorStair(this, floor, (Floorplan::StairFreeform*)stair) );
|
||||
addElement( new MMFloorStair(this, floor, (Floorplan::StairFreeform*)stair) );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
floor->stairs.push_back(stair);
|
||||
|
||||
// add to myself as element
|
||||
elements.push_back(new MMFloorStair(this, floor, stair));
|
||||
addElement(new MMFloorStair(this, floor, stair));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ public:
|
||||
|
||||
// the underlays
|
||||
for (Floorplan::UnderlayImage* img : floor->underlays) {
|
||||
elements.push_back(new MMFloorUnderlayImage(this, floor, img));
|
||||
addElement(new MMFloorUnderlayImage(this, floor, img));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
|
||||
// add to myself as element
|
||||
MMFloorUnderlayImage* img = new MMFloorUnderlayImage(this, floor, elem);
|
||||
elements.push_back(img);
|
||||
addElement(img);
|
||||
img->setAnchor(center);
|
||||
img->setScale(0.1, 0.1);
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
|
||||
// add all floors
|
||||
for (Floorplan::Floor* floor : map->floors) {
|
||||
new MMFloor(this, floor);
|
||||
new MMFloor(this, map, floor);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -32,6 +32,22 @@ public:
|
||||
/** get the underlying model */
|
||||
Floorplan::IndoorMap* getMap() {return map;}
|
||||
|
||||
MMFloor* createFloor() {
|
||||
|
||||
// add to underlying model
|
||||
Floorplan::Floor* floor = new Floorplan::Floor();
|
||||
floor->name = "floor";
|
||||
map->floors.push_back(floor);
|
||||
|
||||
// add to UI model
|
||||
MMFloor* mmfloor = new MMFloor(this, map, floor);
|
||||
//elements.push_back(mmfloor);
|
||||
|
||||
return mmfloor;
|
||||
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif // MMFLOORS_H
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
#include "MapLayerListener.h"
|
||||
|
||||
class MapModelElement;
|
||||
|
||||
|
||||
@@ -28,14 +30,17 @@ enum class MapLayerType {
|
||||
|
||||
class MapLayer {
|
||||
|
||||
/** this layer's elements */
|
||||
std::vector<MapModelElement*> elements;
|
||||
|
||||
/** attached listeners (if any) */
|
||||
std::vector<MapLayerListener*> listeners;
|
||||
|
||||
protected:
|
||||
|
||||
/** this layer's parent */
|
||||
MapLayer* parent;
|
||||
|
||||
/** this layer's elements */
|
||||
std::vector<MapModelElement*> elements;
|
||||
|
||||
/** this layer's sublayers */
|
||||
std::vector<MapLayer*> sublayers;
|
||||
|
||||
@@ -60,6 +65,11 @@ public:
|
||||
/** dtor */
|
||||
virtual ~MapLayer() {;}
|
||||
|
||||
/** attach a listener to this layer [usually only added to the root layer] */
|
||||
void addListener(MapLayerListener* listener) {
|
||||
listeners.push_back(listener);
|
||||
}
|
||||
|
||||
/** get the layer's parent */
|
||||
MapLayer* getParent() const {return parent;}
|
||||
|
||||
@@ -77,14 +87,28 @@ public:
|
||||
size_t getNumElements() const {return elements.size();}
|
||||
|
||||
/** remove the given element from the elements list */
|
||||
void removeElement(const MapModelElement* elem) { elements.erase(std::remove(elements.begin(), elements.end(), elem), elements.end()); }
|
||||
void removeElement(const MapModelElement* elem) {
|
||||
elements.erase(std::remove(elements.begin(), elements.end(), elem), elements.end());
|
||||
onElemRemoved(elem);
|
||||
}
|
||||
|
||||
/** add a new element to this layer */
|
||||
void addElement(MapModelElement* el) {
|
||||
elements.push_back(el);
|
||||
onElemAdded(el);
|
||||
}
|
||||
|
||||
/** remove the given sublayer from this layer */
|
||||
void removeSublayer(const MapLayer* layer) { sublayers.erase(std::remove(sublayers.begin(), sublayers.end(), layer), sublayers.end()); }
|
||||
|
||||
/** is this layer currently visible? */
|
||||
bool isVisible() const {return visible;}
|
||||
|
||||
/** make this layer visible */
|
||||
void setVisible(const bool visible) {this->visible = visible;}
|
||||
void setVisible(const bool visible) {
|
||||
this->visible = visible;
|
||||
onVisibilityChanged(visible);
|
||||
}
|
||||
|
||||
|
||||
/** get all sub-layers within this layer */
|
||||
@@ -94,7 +118,7 @@ public:
|
||||
/** helper method to get all elements and those of all sub-layers */
|
||||
void getVisibleElementsRecursive(std::vector<MapModelElement*>& el) {
|
||||
if (isVisible()) {
|
||||
std::vector<MapModelElement*> local = getElements();
|
||||
const std::vector<MapModelElement*> local = getElements();
|
||||
el.insert(el.end(), local.begin(), local.end());
|
||||
for (MapLayer* sub : getSubLayers()) {
|
||||
sub->getVisibleElementsRecursive(el);
|
||||
@@ -102,9 +126,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
public:
|
||||
|
||||
/** add a new sublayer to this layer */
|
||||
void addSublayer(MapLayer* ml) {
|
||||
@@ -115,8 +137,35 @@ protected:
|
||||
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
void onElemAdded(MapModelElement* e) {
|
||||
if (parent) {parent->onElemAdded(e);}
|
||||
for (MapLayerListener* listener : listeners) {
|
||||
listener->onLayerChanged(this);
|
||||
listener->onLayerElementAdded(this, e);
|
||||
}
|
||||
}
|
||||
|
||||
void onElemRemoved(const MapModelElement* e) {
|
||||
if (parent) {parent->onElemRemoved(e);}
|
||||
for (MapLayerListener* listener : listeners) {
|
||||
listener->onLayerChanged(this);
|
||||
listener->onLayerElementRemoved(this, e);
|
||||
}
|
||||
}
|
||||
|
||||
void onVisibilityChanged(const bool visibile) {
|
||||
if (parent) {parent->onVisibilityChanged(visibile);}
|
||||
for (MapLayerListener* listener : listeners) {
|
||||
listener->onLayerChanged(this);
|
||||
listener->onLayerVisibilityChanged(this, visibile);
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
class MapLayerRoot : public MapLayer {
|
||||
|
||||
public:
|
||||
|
||||
25
mapview/model/MapLayerListener.h
Normal file
25
mapview/model/MapLayerListener.h
Normal file
@@ -0,0 +1,25 @@
|
||||
#ifndef MAPLAYERLISTENER_H
|
||||
#define MAPLAYERLISTENER_H
|
||||
|
||||
class MapLayer;
|
||||
class MapModelElement;
|
||||
|
||||
class MapLayerListener {
|
||||
|
||||
public:
|
||||
|
||||
/** the map layer has changed. e.g. new elements were added */
|
||||
virtual void onLayerChanged(MapLayer* layer) = 0;
|
||||
|
||||
/** a new element was added to a layer */
|
||||
virtual void onLayerElementAdded(MapLayer* layer, MapModelElement* elem) = 0;
|
||||
|
||||
/** an element was removed from the layer */
|
||||
virtual void onLayerElementRemoved(MapLayer* layer, const MapModelElement* elem) = 0;
|
||||
|
||||
/** the layer's visibility has changed */
|
||||
virtual void onLayerVisibilityChanged(MapLayer* layer, const bool visible) = 0;
|
||||
|
||||
};
|
||||
|
||||
#endif // MAPLAYERLISTENER_H
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "MapLayer.h"
|
||||
#include "MapModelElement.h"
|
||||
#include "MapModelListener.h"
|
||||
|
||||
#include "MMRoot.h"
|
||||
|
||||
@@ -13,7 +14,7 @@
|
||||
#include <Indoor/floorplan/v2/FloorplanReader.h>
|
||||
#include <Indoor/floorplan/v2/FloorplanWriter.h>
|
||||
|
||||
class MapModel : public QObject {
|
||||
class MapModel : public QObject, public MapLayerListener {
|
||||
|
||||
Q_OBJECT
|
||||
|
||||
@@ -31,6 +32,9 @@ private:
|
||||
/** the loaded floorplan */
|
||||
Floorplan::IndoorMap* im;
|
||||
|
||||
/** listener */
|
||||
std::vector<MapModelListener*> listeners;
|
||||
|
||||
public:
|
||||
|
||||
/** ctor */
|
||||
@@ -42,6 +46,19 @@ public:
|
||||
cleanup();
|
||||
}
|
||||
|
||||
/** attach a listener */
|
||||
void addListener(MapModelListener* l) {
|
||||
listeners.push_back(l);
|
||||
}
|
||||
|
||||
/** create a new, empty root node */
|
||||
void startEmpty() {
|
||||
im = new Floorplan::IndoorMap();
|
||||
root = new MMRoot(nullptr, im);
|
||||
root->addListener(this);
|
||||
//root->addSublayer(new MMFloors(root, im));
|
||||
}
|
||||
|
||||
void cleanup() {
|
||||
selLayer = nullptr;
|
||||
//selElements.clear();
|
||||
@@ -57,6 +74,7 @@ public:
|
||||
// load the indoor-map using the given XML-file
|
||||
im = Floorplan::Reader::readFromFile(file);
|
||||
root = new MMRoot(nullptr, im);
|
||||
root->addListener(this);
|
||||
|
||||
emit reset();
|
||||
|
||||
@@ -68,6 +86,22 @@ public:
|
||||
|
||||
}
|
||||
|
||||
void onLayerChanged(MapLayer* layer) override {
|
||||
for (MapModelListener* l : listeners) {l->onLayerChanged(layer);}
|
||||
}
|
||||
|
||||
void onLayerElementAdded(MapLayer* layer, MapModelElement* elem) override {
|
||||
for (MapModelListener* l : listeners) {l->onLayerElementAdded(layer, elem);}
|
||||
}
|
||||
|
||||
void onLayerElementRemoved(MapLayer* layer, const MapModelElement* elem) override {
|
||||
for (MapModelListener* l : listeners) {l->onLayerElementRemoved(layer, elem);}
|
||||
}
|
||||
|
||||
void onLayerVisibilityChanged(MapLayer* layer, const bool visible) override {
|
||||
for (MapModelListener* l : listeners) {l->onLayerVisibilityChanged(layer, visible);}
|
||||
}
|
||||
|
||||
/** get the constructed map */
|
||||
Floorplan::IndoorMap* getMap() const {
|
||||
return im;
|
||||
@@ -76,18 +110,21 @@ public:
|
||||
/** get the map's root-layer containing all other layers */
|
||||
MapLayer* getRootLayer() { return root; }
|
||||
|
||||
/** get all elements within the currently selected layer */
|
||||
std::vector<MapModelElement*> getSelectedLayerElements() {
|
||||
//return selElements;
|
||||
//return (selLayer) ? (selLayer->getElementsRecursive()) : (std::vector<MapModelElement*>());
|
||||
std::vector<MapModelElement*> elements;
|
||||
root->getVisibleElementsRecursive(elements);
|
||||
return elements;
|
||||
}
|
||||
// /** get all elements within the currently selected layer */
|
||||
// std::vector<MapModelElement*> getSelectedLayerElements() {
|
||||
// //return selElements;
|
||||
// //return (selLayer) ? (selLayer->getElementsRecursive()) : (std::vector<MapModelElement*>());
|
||||
//// std::vector<MapModelElement*> elements;
|
||||
//// root->getVisibleElementsRecursive(elements);
|
||||
//// return elements;
|
||||
|
||||
// }
|
||||
|
||||
/** get all currently visible elements */
|
||||
std::vector<MapModelElement*> getVisibleElements() {
|
||||
return getSelectedLayerElements();
|
||||
std::vector<MapModelElement*> elements;
|
||||
root->getVisibleElementsRecursive(elements);
|
||||
return elements;
|
||||
}
|
||||
|
||||
/** set the currently selected layer */
|
||||
|
||||
13
mapview/model/MapModelListener.h
Normal file
13
mapview/model/MapModelListener.h
Normal file
@@ -0,0 +1,13 @@
|
||||
#ifndef MAPMODELLISTENER_H
|
||||
#define MAPMODELLISTENER_H
|
||||
|
||||
#include "MapLayerListener.h"
|
||||
|
||||
/**
|
||||
* listen for changes to the map model
|
||||
*/
|
||||
class MapModelListener : public MapLayerListener {
|
||||
|
||||
};
|
||||
|
||||
#endif // MAPMODELLISTENER_H
|
||||
Reference in New Issue
Block a user