resolved some errors caused by a bad merge and new datatypes from indoor
This commit is contained in:
@@ -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 */
|
||||
|
||||
@@ -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));
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user