index 4071a639c6da560f615fc738c2baedbb45c7f370..de4c7dca1977b67bc20e5b25a46d2ac208a7e79b 100644 (file)
-#include <approx-equal.h>
-#include <remove-last.h>
-#include <sp-guide.h>
-#include <sp-guide-constraint.h>
-#include <sp-item.h>
+#include <algorithm>
+
+#include "approx-equal.h"
+#include "remove-last.h"
+#include "sp-guide.h"
+#include "sp-guide-constraint.h"
+#include "sp-item.h"
+
using std::vector;
void sp_item_rm_unsatisfied_cns(SPItem &item)
if (item.constraints.empty()) {
return;
}
- vector<NR::Point> snappoints;
- sp_item_snappoints(&item, true, SnapPointsIter(snappoints));
+ std::vector<Inkscape::SnapCandidatePoint> snappoints;
+ item.getSnappoints(snappoints, NULL);
for (unsigned i = item.constraints.size(); i--;) {
g_assert( i < item.constraints.size() );
SPGuideConstraint const &cn = item.constraints[i];
int const snappoint_ix = cn.snappoint_ix;
g_assert( snappoint_ix < int(snappoints.size()) );
- if (!approx_equal(dot(cn.g->normal, snappoints[snappoint_ix]), cn.g->position)) {
+ if (!approx_equal( cn.g->getDistanceFrom(snappoints[snappoint_ix].getPoint()), 0) ) {
remove_last(cn.g->attached_items, SPGuideAttachment(&item, cn.snappoint_ix));
g_assert( i < item.constraints.size() );
vector<SPGuideConstraint>::iterator const ei(&item.constraints[i]);
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :