index fbc4a93ca5e554b39823f89dc7d86a58a2cde5b2..49d6fbcdbc67e8823b9cd996974555c165f34591 100644 (file)
--- a/src/sp-conn-end-pair.cpp
+++ b/src/sp-conn-end-pair.cpp
}
void
-SPConnEndPair::getEndpoints(NR::Point endPts[]) const {
+SPConnEndPair::getEndpoints(Geom::Point endPts[]) const {
SPCurve *curve = _path->curve;
SPItem *h2attItem[2];
getAttachedItems(h2attItem);
endPts[h] = bbox->midpoint();
} else {
// FIXME
- endPts[h] = NR::Point(0, 0);
+ endPts[h] = Geom::Point(0, 0);
}
}
else
if (_connType != SP_CONNECTOR_NOAVOID) {
g_assert(_connRef != NULL);
if (!(_connRef->isInitialised())) {
- NR::Point endPt[2];
+ Geom::Point endPt[2];
getEndpoints(endPt);
- Avoid::Point src(endPt[0][NR::X], endPt[0][NR::Y]);
- Avoid::Point dst(endPt[1][NR::X], endPt[1][NR::Y]);
+ Avoid::Point src(endPt[0][Geom::X], endPt[0][Geom::Y]);
+ Avoid::Point dst(endPt[1][Geom::X], endPt[1][Geom::Y]);
_connRef->lateSetup(src, dst);
_connRef->setCallback(&emitPathInvalidationNotification, _path);
SPCurve *curve = _path->curve;
- NR::Point endPt[2];
+ Geom::Point endPt[2];
getEndpoints(endPt);
- Avoid::Point src(endPt[0][NR::X], endPt[0][NR::Y]);
- Avoid::Point dst(endPt[1][NR::X], endPt[1][NR::Y]);
+ Avoid::Point src(endPt[0][Geom::X], endPt[0][Geom::Y]);
+ Avoid::Point dst(endPt[1][Geom::X], endPt[1][Geom::Y]);
_connRef->updateEndPoint(Avoid::VertID::src, src);
_connRef->updateEndPoint(Avoid::VertID::tar, dst);
curve->moveto(endPt[0]);
for (int i = 1; i < route.pn; ++i) {
- NR::Point p(route.ps[i].x, route.ps[i].y);
+ Geom::Point p(route.ps[i].x, route.ps[i].y);
curve->lineto(p);
}
}