FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

merged with master

Browse Source
This commit is contained in:
toni
2017-03-10 15:35:44 +01:00
parent 7ff7334263
commit b18b1a795d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
floorplan/v2/Floorplan.h
View File

@@ -184,7 +184,7 @@ namespace Floorplan {
struct POI; struct POI;
struct Stair; struct Stair;
struct Elevator; struct Elevator;
struct GroundTruthPoint; struct GroundTruthPoint;
using FloorOutline = std::vector<FloorOutlinePolygon*>; using FloorOutline = std::vector<FloorOutlinePolygon*>;
using FloorObstacles = std::vector<FloorObstacle*>; using FloorObstacles = std::vector<FloorObstacle*>;
@@ -195,7 +195,7 @@ namespace Floorplan {
using FloorPOIs = std::vector<POI*>; using FloorPOIs = std::vector<POI*>;
using FloorStairs = std::vector<Stair*>; using FloorStairs = std::vector<Stair*>;
using FloorElevators = std::vector<Elevator*>; using FloorElevators = std::vector<Elevator*>;
using FloorGroundTruthPoints = std::vector<GroundTruthPoint*>; using FloorGroundTruthPoints = std::vector<GroundTruthPoint*>;
/** describes one floor within the map, starting at a given height */ /** describes one floor within the map, starting at a given height */
struct Floor { struct Floor {
@@ -212,7 +212,7 @@ namespace Floorplan {
FloorPOIs pois; // POIs within the floor FloorPOIs pois; // POIs within the floor
FloorStairs stairs; // all stairs within one floor FloorStairs stairs; // all stairs within one floor
FloorElevators elevators; // all elevators within one floor FloorElevators elevators; // all elevators within one floor
FloorGroundTruthPoints gtpoints; // all ground truth points within one floor FloorGroundTruthPoints gtpoints; // all ground truth points within one floor
//FloorKeyValue other; // other, free elements //FloorKeyValue other; // other, free elements
Floor() {;} Floor() {;}
@@ -237,14 +237,14 @@ namespace Floorplan {
bool operator == (const POI& o) const {return (o.type == type) && (o.name == name) && (o.pos == pos);} bool operator == (const POI& o) const {return (o.type == type) && (o.name == name) && (o.pos == pos);}
}; };
/** a GroundTruthPoint located somewhere on a floor */ /** a GroundTruthPoint located somewhere on a floor */
struct GroundTruthPoint { struct GroundTruthPoint {
int id; //TODO: this value can be changed and isn't set incremental within the indoormap int id; //TODO: this value can be changed and isn't set incremental within the indoormap
Point2 pos; Point2 pos;
GroundTruthPoint() : id(), pos() {;} GroundTruthPoint() : id(), pos() {;}
GroundTruthPoint(const int& id, const Point2& pos) : id(id), pos(pos) {;} GroundTruthPoint(const int& id, const Point2& pos) : id(id), pos(pos) {;}
bool operator == (const GroundTruthPoint& o) const {return (o.id == id) && (o.pos == pos);} bool operator == (const GroundTruthPoint& o) const {return (o.id == id) && (o.pos == pos);}
}; };
/** an AccessPoint located somewhere on a floor */ /** an AccessPoint located somewhere on a floor */
struct AccessPoint : public HasMeta { struct AccessPoint : public HasMeta {
@@ -278,7 +278,7 @@ namespace Floorplan {
Beacon() : name(), mac(), pos() {;} Beacon() : name(), mac(), pos() {;}
Beacon(const std::string& name, const std::string& mac, const Point3& pos) : name(name), mac(mac), pos(pos) {;} Beacon(const std::string& name, const std::string& mac, const Point3& pos) : name(name), mac(mac), pos(pos) {;}
bool operator == (const Beacon& o) const {return (o.name == name) && (o.mac == mac) && (o.pos == pos);} bool operator == (const Beacon& o) const {return (o.name == name) && (o.mac == mac) && (o.pos == pos);}
Point3 getPos(const Floor* f) const {return pos + Point3(0,0,f->atHeight);} // relative to the floor's ground Point3 getPos(const Floor* f) const {return pos + Point3(0,0,f->atHeight);} // relative to the floor's ground
}; };