merged
This commit is contained in:
@@ -97,7 +97,7 @@ namespace Floorplan {
|
||||
if (std::string("pois") == n->Name()) {floor->pois = parseFloorPOIs(n);}
|
||||
if (std::string("stairs") == n->Name()) {floor->stairs = parseFloorStairs(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;
|
||||
}
|
||||
@@ -281,12 +281,12 @@ namespace Floorplan {
|
||||
Beacon* b = new Beacon();
|
||||
b->mac = n->Attribute("mac");
|
||||
b->name = n->Attribute("name");
|
||||
// b->major = n->Attribute("major");
|
||||
// b->minor = n->Attribute("minor");
|
||||
// b->uuid = n->Attribute("uuid");
|
||||
// b->model.txp = n->FloatAttribute("mdl_txp");
|
||||
// b->model.exp = n->FloatAttribute("mdl_exp");
|
||||
// b->model.waf = n->FloatAttribute("mdl_waf");
|
||||
b->major = n->Attribute("major");
|
||||
b->minor = n->Attribute("minor");
|
||||
b->uuid = n->Attribute("uuid");
|
||||
b->model.txp = n->FloatAttribute("mdl_txp");
|
||||
b->model.exp = n->FloatAttribute("mdl_exp");
|
||||
b->model.waf = n->FloatAttribute("mdl_waf");
|
||||
b->pos = parsePoint3(n);
|
||||
return b;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user