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

merged

Browse Source
This commit is contained in:
toni
2017-03-10 14:45:26 +01:00
parent e48d3bafcd 2255904385
commit 2eb9405950
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
floorplan/v2/FloorplanReader.h
View File

@@ -97,7 +97,7 @@ namespace Floorplan {
if (std::string("pois") == n->Name()) {floor->pois = parseFloorPOIs(n);} if (std::string("pois") == n->Name()) {floor->pois = parseFloorPOIs(n);}
if (std::string("stairs") == n->Name()) {floor->stairs = parseFloorStairs(n);} if (std::string("stairs") == n->Name()) {floor->stairs = parseFloorStairs(n);}
if (std::string("elevators") == n->Name()) {floor->elevators = parseFloorElevators(n);} if (std::string("elevators") == n->Name()) {floor->elevators = parseFloorElevators(n);}
if (std::string("gtpoints") == n->Name()) {floor->gtpoints = parseFloorGroundTruthPoints(n);} if (std::string("gtpoints") == n->Name()) {floor->gtpoints = parseFloorGroundTruthPoints(n);}
} }
return floor; return floor;
} }
@@ -281,12 +281,12 @@ namespace Floorplan {
Beacon* b = new Beacon(); Beacon* b = new Beacon();
b->mac = n->Attribute("mac"); b->mac = n->Attribute("mac");
b->name = n->Attribute("name"); b->name = n->Attribute("name");
// b->major = n->Attribute("major"); b->major = n->Attribute("major");
// b->minor = n->Attribute("minor"); b->minor = n->Attribute("minor");
// b->uuid = n->Attribute("uuid"); b->uuid = n->Attribute("uuid");
// b->model.txp = n->FloatAttribute("mdl_txp"); b->model.txp = n->FloatAttribute("mdl_txp");
// b->model.exp = n->FloatAttribute("mdl_exp"); b->model.exp = n->FloatAttribute("mdl_exp");
// b->model.waf = n->FloatAttribute("mdl_waf"); b->model.waf = n->FloatAttribute("mdl_waf");
b->pos = parsePoint3(n); b->pos = parsePoint3(n);
return b; return b;
} }