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

Merge remote-tracking branch 'origin/master' into workingToni

Browse Source
This commit is contained in:
toni
2016-12-01 19:51:23 +01:00
parent e10ba2cfd9 2255904385
commit 5ec0b7e9ee
4 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
floorplan/v2/FloorplanReader.h
View File

@@ -260,6 +260,9 @@ namespace Floorplan {
ap->mac = n->Attribute("mac");
ap->name = n->Attribute("name");
ap->pos = parsePoint3(n);
ap->model.txp = n->FloatAttribute("mdl_txp");
ap->model.exp = n->FloatAttribute("mdl_exp");
ap->model.waf = n->FloatAttribute("mdl_waf");
return ap;
}
@@ -278,6 +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->pos = parsePoint3(n);
return b;
}