now that selection description includes style (filtered, clipped), we need to update...

[inkscape.git] / src / line-snapper.cpp

diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index f2d2f2ff624b0b46099fd802e324cf5cdd579a91..bc43d640b0d9c6a327c26fe2e8a2609b2b1f69eb 100644 (file)
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -5,7 +5,7 @@
  * Authors:
  *   Diederik van Lierop <mail@diedenrezi.nl>
  *   And others...
- * 
+ *
  * Copyright (C) 1999-2008 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -19,7 +19,7 @@
 #include <gtk/gtk.h>
 #include "snap.h"
 
-Inkscape::LineSnapper::LineSnapper(SnapManager const *sm, Geom::Coord const d) : Snapper(sm, d)
+Inkscape::LineSnapper::LineSnapper(SnapManager *sm, Geom::Coord const d) : Snapper(sm, d)
 {
 }
 
@@ -31,10 +31,10 @@ void Inkscape::LineSnapper::freeSnap(SnappedConstraints &sc,
                                                     std::vector<SPItem const *> const */*it*/,
                                                     std::vector<Geom::Point> */*unselected_nodes*/) const
 {
-       if (_snap_enabled == false || _snapmanager->snapprefs.getSnapFrom(t) == false) {
+       if (!(_snap_enabled && _snapmanager->snapprefs.getSnapFrom(t)) ) {
         return;
-    }   
-    
+    }
+
     /* Get the lines that we will try to snap to */
     const LineList lines = _getSnapLines(p);
 
@@ -45,16 +45,16 @@ void Inkscape::LineSnapper::freeSnap(SnappedConstraints &sc,
         Geom::Point const p2 = p1 + Geom::rot90(i->first); // 2nd point at guide/grid line
         // std::cout << "  line through " << i->second << " with normal " << i->first;
         g_assert(i->first != Geom::Point(0,0)); // we cannot project on an linesegment of zero length
-        
+
         Geom::Point const p_proj = project_on_linesegment(p, p1, p2);
         Geom::Coord const dist = Geom::L2(p_proj - p);
         //Store any line that's within snapping range
         if (dist < getSnapperTolerance()) {
             _addSnappedLine(sc, p_proj, dist, i->first, i->second);
-            // std::cout << " -> distance = " << dist; 
-        }     
+            // std::cout << " -> distance = " << dist;
+        }
         // std::cout << std::endl;
-    }    
+    }
 }
 
 void Inkscape::LineSnapper::constrainedSnap(SnappedConstraints &sc,
@@ -69,7 +69,7 @@ void Inkscape::LineSnapper::constrainedSnap(SnappedConstraints &sc,
     if (_snap_enabled == false || _snapmanager->snapprefs.getSnapFrom(t) == false) {
         return;
     }
-    
+
     /* Get the lines that we will try to snap to */
     const LineList lines = _getSnapLines(p);
 
@@ -77,19 +77,19 @@ void Inkscape::LineSnapper::constrainedSnap(SnappedConstraints &sc,
         if (Geom::L2(c.getDirection()) > 0) { // Can't do a constrained snap without a constraint
             /* Normal to the line we're trying to snap along */
             Geom::Point const n(Geom::rot90(Geom::unit_vector(c.getDirection())));
-    
+
             Geom::Point const point_on_line = c.hasPoint() ? c.getPoint() : p;
-    
+
             /* Constant term of the line we're trying to snap along */
             Geom::Coord const q0 = dot(n, point_on_line);
             /* Constant term of the grid or guide line */
-            Geom::Coord const q1 = dot(i->first, i->second);        
-    
+            Geom::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, q0, i->first, q1, t_2geom);
             Geom::Point t(t_2geom);
-    
+
             if (k == Geom::intersects) {
                 const Geom::Coord dist = L2(t - p);
                 if (dist < getSnapperTolerance()) {
@@ -98,8 +98,8 @@ void Inkscape::LineSnapper::constrainedSnap(SnappedConstraints &sc,
                     // to look for additional intersections; just return the snapped point
                     // and forget about the line
                     sc.points.push_back(SnappedPoint(t, Inkscape::SNAPTARGET_UNDEFINED, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true));
-                    // The type of the snap target is yet undefined, as we cannot tell whether 
-                    // we're snapping to grid or the guide lines; must be set by on a higher level   
+                    // The type of the snap target is yet undefined, as we cannot tell whether
+                    // we're snapping to grid or the guide lines; must be set by on a higher level
                 }
             }
         }