resolved some errors caused by a bad merge and new datatypes from indoor

This commit is contained in:
toni
2017-03-10 15:25:32 +01:00
parent 3d9d2a7529
commit 87d57ef134
4 changed files with 80 additions and 65 deletions

View File

@@ -30,8 +30,8 @@ public:
}
/** get the element's minimal distance (nearest whatsoever) to the given point */
float getMinDistanceXY(const Point2 p) const override {
return p.getDistance(gtp->pos);
ClickDist getMinDistanceXY(const Point2 p) const override {
return ClickDist(p.getDistance(gtp->pos), ClickDistType::DIRECT);
}
/** repaint me */

View File

@@ -20,7 +20,7 @@ public:
// the POIs
for (Floorplan::GroundTruthPoint* gtp : floor->gtpoints) {
elements.push_back(new MMFloorGroundTruthPoint(this, floor, gtp));
addElement(new MMFloorGroundTruthPoint(this, floor, gtp));
}
}
@@ -35,7 +35,7 @@ public:
floor->gtpoints.push_back(gtp);
// add to myself as element
elements.push_back(new MMFloorGroundTruthPoint(this, floor, gtp));
addElement(new MMFloorGroundTruthPoint(this, floor, gtp));
}