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

This commit is contained in:
toni
2016-12-01 19:51:23 +01:00
4 changed files with 48 additions and 1 deletions

View File

@@ -163,6 +163,9 @@ namespace Floorplan {
accesspoint->SetAttribute("x", ap->pos.x);
accesspoint->SetAttribute("y", ap->pos.y);
accesspoint->SetAttribute("z", ap->pos.z);
accesspoint->SetAttribute("mdl_txp", ap->model.txp);
accesspoint->SetAttribute("mdl_exp", ap->model.exp);
accesspoint->SetAttribute("mdl_waf", ap->model.waf);
accesspoints->InsertEndChild(accesspoint);
}
floor->InsertEndChild(accesspoints);
@@ -172,9 +175,15 @@ namespace Floorplan {
XMLElem* beacon = doc.NewElement("beacon");
beacon->SetAttribute("name", b->name.c_str());
beacon->SetAttribute("mac", b->mac.c_str());
beacon->SetAttribute("major", b->major.c_str());
beacon->SetAttribute("minor", b->minor.c_str());
beacon->SetAttribute("uuid", b->uuid.c_str());
beacon->SetAttribute("x", b->pos.x);
beacon->SetAttribute("y", b->pos.y);
beacon->SetAttribute("z", b->pos.z);
beacon->SetAttribute("mdl_txp", b->model.txp);
beacon->SetAttribute("mdl_exp", b->model.exp);
beacon->SetAttribute("mdl_waf", b->model.waf);
beacons->InsertEndChild(beacon);
}
floor->InsertEndChild(beacons);