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

added support for pillars

Browse Source 
some new helper methods/classes
This commit is contained in:
FrankE
2018-05-22 11:45:35 +02:00
parent a22290415e
commit 9e6d9f4ce7
13 changed files with 185 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
floorplan/v2/Floorplan.h
View File

@@ -165,6 +165,7 @@ namespace Floorplan {
DRYWALL,
GLASS,
METAL,
METALLIZED_GLAS,
_END,
};
@@ -356,8 +357,10 @@ namespace Floorplan {
struct FloorObstacleCircle : public FloorObstacle {
Point2 center;
float radius;
FloorObstacleCircle(const Material material, const Point2 center, const float radius) : FloorObstacle(material), center(center), radius(radius) {;}
FloorObstacleCircle(const Material material, const float cx, const float cy, const float radius) : FloorObstacle(material), center(cx,cy), radius(radius) {;}
float height = 0; // 0 = floor's height
FloorObstacleCircle(const Material material, const Point2 center, const float radius, const float height=0) : FloorObstacle(material), center(center), radius(radius), height(height) {;}
FloorObstacleCircle(const Material material, const float cx, const float cy, const float radius, const float height=0) : FloorObstacle(material), center(cx,cy), radius(radius), height(height) {;}
//float getHeight(const Floor* f) const {return (height > 0) ? (height) : (f->height);}
};
/** door obstacle */

24
floorplan/v2/FloorplanHelper.h
View File

@@ -29,6 +29,18 @@ public:
return std::make_pair(nullptr, nullptr);
}
/** get the AP for the given Name [if available] */
static std::pair<Floorplan::AccessPoint*, Floorplan::Floor*> getAPByName(const Floorplan::IndoorMap* map, const std::string& name) {
for (Floorplan::Floor* f : map->floors) {
for (Floorplan::AccessPoint* ap : f->accesspoints) {
if (name == ap->name) {
return std::make_pair(ap, f);
}
}
}
return std::make_pair(nullptr, nullptr);
}
/** get all APs within the map */
static std::vector<std::pair<Floorplan::AccessPoint*, Floorplan::Floor*>> getAPs(const Floorplan::IndoorMap* map) {
std::vector<std::pair<Floorplan::AccessPoint*, Floorplan::Floor*>> res;
@@ -40,6 +52,18 @@ public:
return res;
}
/** get the Fingerprint-Loation for the given Name [if available] */
static std::pair<Floorplan::FingerprintLocation*, Floorplan::Floor*> getFingerprintLocationByName(const Floorplan::IndoorMap* map, const std::string& name) {
for (Floorplan::Floor* f : map->floors) {
for (Floorplan::FingerprintLocation* fpl : f->fpLocations) {
if (name == fpl->name) {
return std::make_pair(fpl, f);
}
}
}
return std::make_pair(nullptr, nullptr);
}
/** get all ground-truth points within the map as hash-map: id->pos */
static std::unordered_map<int, Point3> getGroundTruthPoints(const Floorplan::IndoorMap* map) {
std::unordered_map<int, Point3> res;

3
floorplan/v2/FloorplanReader.h
View File

@@ -412,7 +412,8 @@ namespace Floorplan {
return new FloorObstacleCircle(
parseMaterial(el->Attribute("material")),
el->FloatAttribute("cx"), el->FloatAttribute("cy"),
el->FloatAttribute("radius")
el->FloatAttribute("radius"),
el->FloatAttribute("height")
);
}

1
floorplan/v2/FloorplanWriter.h
View File

@@ -344,6 +344,7 @@ namespace Floorplan {
obstacle->SetAttribute("cx", circle->center.x);
obstacle->SetAttribute("cy", circle->center.y);
obstacle->SetAttribute("radius", circle->radius);
obstacle->SetAttribute("height", circle->height);
obstacles->InsertEndChild(obstacle);
}