Move all of the snapper code to 2geom

(bzr r6606)

1 files changed, 18 insertions, 18 deletions

diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index d06d027e3..db7a20e4f 100644
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -18,18 +18,18 @@
 #include "snapped-line.h"
 #include <gtk/gtk.h>
 
-Inkscape::LineSnapper::LineSnapper(SPNamedView const *nv, NR::Coord const d) : Snapper(nv, d)
+Inkscape::LineSnapper::LineSnapper(SPNamedView const *nv, Geom::Coord const d) : Snapper(nv, d)
 {
 
 }
 
 void Inkscape::LineSnapper::freeSnap(SnappedConstraints &sc,
                                                     Inkscape::Snapper::PointType const &t,
-                                                    NR::Point const &p,
+                                                    Geom::Point const &p,
                                                     bool const &/*f*/,
-                                                    boost::optional<NR::Rect> const &/*bbox_to_snap*/,
+                                                    boost::optional<Geom::Rect> const &/*bbox_to_snap*/,
                                                     std::vector<SPItem const *> const */*it*/,
-                                                    std::vector<NR::Point> */*unselected_nodes*/) const
+                                                    std::vector<Geom::Point> */*unselected_nodes*/) const
 {
     if (_snap_enabled == false || getSnapFrom(t) == false) {
         return;
@@ -41,13 +41,13 @@ void Inkscape::LineSnapper::freeSnap(SnappedConstraints &sc,
     // std::cout << "snap point " << p << " to: " << std::endl;
 
     for (LineList::const_iterator i = lines.begin(); i != lines.end(); i++) {
-        NR::Point const p1 = i->second; // point at guide/grid line
-        NR::Point const p2 = p1 + NR::rot90(i->first); // 2nd point at guide/grid line
+        Geom::Point const p1 = i->second; // point at guide/grid line
+        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 != NR::Point(0,0)); // we cannot project on an linesegment of zero length
+        g_assert(i->first != Geom::Point(0,0)); // we cannot project on an linesegment of zero length
         
-        NR::Point const p_proj = project_on_linesegment(p, p1, p2);
-        NR::Coord const dist = NR::L2(p_proj - p);
+        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);
@@ -59,9 +59,9 @@ void Inkscape::LineSnapper::freeSnap(SnappedConstraints &sc,
 
 void Inkscape::LineSnapper::constrainedSnap(SnappedConstraints &sc,
                                                Inkscape::Snapper::PointType const &t,
-                                               NR::Point const &p,
+                                               Geom::Point const &p,
                                                bool const &/*f*/,
-                                               boost::optional<NR::Rect> const &/*bbox_to_snap*/,
+                                               boost::optional<Geom::Rect> const &/*bbox_to_snap*/,
                                                ConstraintLine const &c,
                                                std::vector<SPItem const *> const */*it*/) const
 
@@ -74,24 +74,24 @@ void Inkscape::LineSnapper::constrainedSnap(SnappedConstraints &sc,
     const LineList lines = _getSnapLines(p);
 
     for (LineList::const_iterator i = lines.begin(); i != lines.end(); i++) {
-        if (NR::L2(c.getDirection()) > 0) { // Can't do a constrained snap without a constraint
+        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 */
-            NR::Point const n(NR::rot90(NR::unit_vector(c.getDirection())));
+            Geom::Point const n(Geom::rot90(Geom::unit_vector(c.getDirection())));
     
-            NR::Point const point_on_line = c.hasPoint() ? c.getPoint() : p;
+            Geom::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);
+            Geom::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);        
+            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);
-            NR::Point t(t_2geom);
+            Geom::Point t(t_2geom);
     
             if (k == Geom::intersects) {
-                const NR::Coord dist = L2(t - p);
+                const Geom::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