From 3614957da595ec421cad8350fe3b645d3f9e836e Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Thu, 3 Jan 2008 21:37:41 +0000
Subject: 1) fix snapping while scaling 2) fix constrained snapping 3) improve
 snapping logic (again), or more specifically: better obey "always snap" 4)
 refactoring to reduce risk of bugs: renaming variables and methods for better
 readability, adding class members instead of using std::pairs, etc.

(bzr r4379)
---
 src/snapped-point.cpp | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

(limited to 'src/snapped-point.cpp')

diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp
index d97abda1d..8a0aea3c7 100644
--- a/src/snapped-point.cpp
+++ b/src/snapped-point.cpp
@@ -11,17 +11,32 @@
 
 #include "snapped-point.h"
 
-Inkscape::SnappedPoint::SnappedPoint(NR::Point p, NR::Coord d, bool at_intersection, NR::Coord d2)
-    : _distance(d), _point(p), _at_intersection(at_intersection), _second_distance(d2)
+// overloaded constructor
+Inkscape::SnappedPoint::SnappedPoint(NR::Point p, NR::Coord d, NR::Coord t, bool a)
+    : _point(p), _distance(d), _tolerance(t), _always_snap(a)
+{
+    _at_intersection = false;
+    _second_distance = NR_HUGE;
+    _second_tolerance = 0;
+    _second_always_snap = false;
+}
+
+Inkscape::SnappedPoint::SnappedPoint(NR::Point p, NR::Coord d, NR::Coord t, bool a, bool at_intersection, NR::Coord d2, NR::Coord t2, bool a2)
+    : _point(p), _distance(d), _tolerance(t), _always_snap(a), _at_intersection(at_intersection), 
+    _second_distance(d2), _second_tolerance(t2), _second_always_snap(a2)
 {
 }
 
 Inkscape::SnappedPoint::SnappedPoint()
 {
-    _distance = NR_HUGE;
     _point = NR::Point(0,0);
+    _distance = NR_HUGE;
+    _tolerance = 0;
+    _always_snap = false;
     _at_intersection = false;
     _second_distance = NR_HUGE;
+    _second_tolerance = 0;
+    _second_always_snap = false;
 }
 
 
@@ -35,11 +50,31 @@ NR::Coord Inkscape::SnappedPoint::getDistance() const
     return _distance;
 }
 
+NR::Coord Inkscape::SnappedPoint::getTolerance() const
+{
+    return _tolerance;
+}
+
+bool Inkscape::SnappedPoint::getAlwaysSnap() const
+{
+    return _always_snap;
+}
+
 NR::Coord Inkscape::SnappedPoint::getSecondDistance() const
 {
     return _second_distance;
 }
 
+NR::Coord Inkscape::SnappedPoint::getSecondTolerance() const
+{
+    return _second_tolerance;
+}
+
+bool Inkscape::SnappedPoint::getSecondAlwaysSnap() const
+{
+    return _second_always_snap;
+}
+
 
 NR::Point Inkscape::SnappedPoint::getPoint() const
 {
-- 
cgit v1.2.3