diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index 7fc6a32a473db511b5c3e49a2c82a10d628010a2..219bc7482d7501c54d6259087a488acce0d64d0f 100644 (file)
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
NR::Point const &p,
bool const &f,
std::vector<NR::Point> &points_to_snap,
- std::list<SPItem const *> const &it) const
+ std::list<SPItem const *> const &it,
+ std::vector<NR::Point> *unselected_nodes) const
{
- Inkscape::SnappedPoint s = SnappedPoint(p, NR_HUGE);
-
/* Get the lines that we will try to snap to */
const LineList lines = _getSnapLines(p);
NR::Point const p_proj = project_on_linesegment(p, p1, p2);
NR::Coord const dist = NR::L2(p_proj - p);
//Store any line that's within snapping range
- if (dist < getDistance()) {
+ if (dist < getSnapperTolerance()) {
_addSnappedLine(sc, p_proj, dist, i->first, i->second);
// std::cout << " -> distance = " << dist;
}
std::list<SPItem const *> const &/*it*/) const
{
- Inkscape::SnappedPoint s = SnappedPoint(p, NR_HUGE);
-
/* Get the lines that we will try to snap to */
const LineList lines = _getSnapLines(p);
for (LineList::const_iterator i = lines.begin(); i != lines.end(); i++) {
-
- /* Normal to the line we're trying to snap along */
- NR::Point const n(NR::rot90(NR::unit_vector(c.getDirection())));
-
- NR::Point const point_on_line = c.hasPoint() ? c.getPoint() : p;
-
- /* Constant term of the line we're trying to snap along */
- NR::Coord const q0 = dot(n, point_on_line);
- /* Constant term of the grid or guide line */
- NR::Coord const q1 = dot(i->first, i->second);
-
- /* Try to intersect this line with the target line */
- Geom::Point t_2geom(NR_HUGE, NR_HUGE);
- Geom::IntersectorKind const k = Geom::line_intersection(n.to_2geom(), q0, i->first.to_2geom(), q1, t_2geom);
- NR::Point t(t_2geom);
-
- if (k == Geom::intersects) {
- const NR::Coord dist = L2(t - p);
- if (dist < getDistance()) {
- // When doing a constrained snap, we're already at an intersection.
- // This snappoint is therefore fully constrained, so there's no need
- // to look for additional intersections; just return the snapped point
- // and forget about the line
- sc.points.push_back(SnappedPoint(t, dist));
+ if (NR::L2(c.getDirection()) > 0) { // Can't do a constrained snap without a constraint
+ /* Normal to the line we're trying to snap along */
+ NR::Point const n(NR::rot90(NR::unit_vector(c.getDirection())));
+
+ NR::Point const point_on_line = c.hasPoint() ? c.getPoint() : p;
+
+ /* Constant term of the line we're trying to snap along */
+ NR::Coord const q0 = dot(n, point_on_line);
+ /* Constant term of the grid or guide line */
+ NR::Coord const q1 = dot(i->first, i->second);
+
+ /* Try to intersect this line with the target line */
+ Geom::Point t_2geom(NR_HUGE, NR_HUGE);
+ Geom::IntersectorKind const k = Geom::line_intersection(n.to_2geom(), q0, i->first.to_2geom(), q1, t_2geom);
+ NR::Point t(t_2geom);
+
+ if (k == Geom::intersects) {
+ const NR::Coord dist = L2(t - p);
+ if (dist < getSnapperTolerance()) {
+ // When doing a constrained snap, we're already at an intersection.
+ // This snappoint is therefore fully constrained, so there's no need
+ // to look for additional intersections; just return the snapped point
+ // and forget about the line
+ sc.points.push_back(SnappedPoint(t, dist, getSnapperTolerance(), getSnapperAlwaysSnap()));
+ }
}
}
}