X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsnapped-line.h;h=3dec432e7eff4e119a01f1695f6be1d41bdf152b;hb=958c867c4ffb2cafbc87fb484a20c20dab458f3b;hp=0b8c9053f8548315ec1e21d05c5683cc113aed06;hpb=e1da05d7d6b8a6d4ddbca0fd1d7e633a84b2c1cf;p=inkscape.git

diff --git a/src/snapped-line.h b/src/snapped-line.h
index 0b8c9053f..3dec432e7 100644
--- a/src/snapped-line.h
+++ b/src/snapped-line.h
@@ -3,7 +3,7 @@
 
 /**
  *    \file src/snapped-line.h
- *    \brief SnappedInfiniteLine class.
+ *    \brief SnappedLine class.
  *
  *    Authors:
  *      Diederik van Lierop <mail@diedenrezi.nl>
@@ -13,54 +13,55 @@
 
 #include <vector>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
-#include <libnr/nr-point-fns.h>
 #include "snapped-point.h"
 
 namespace Inkscape
 {
 
 /// Class describing the result of an attempt to snap to a line segment.
-class SnappedLine : public SnappedPoint
+class SnappedLineSegment : public SnappedPoint
 {
 public:
-  	SnappedLine();
-    SnappedLine(NR::Point snapped_point, NR::Coord snapped_distance, NR::Point start_point_of_line, NR::Point end_point_of_line);
-    ~SnappedLine();
-    Inkscape::SnappedPoint intersect(SnappedLine const &line) const; //intersect with another SnappedLine
-    
+    SnappedLineSegment();
+    SnappedLineSegment(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, SnapTargetType const &target, Geom::Coord const &snapped_tolerance,bool const &always_snap, Geom::Point const &start_point_of_line, Geom::Point const &end_point_of_line);
+    ~SnappedLineSegment();
+    Inkscape::SnappedPoint intersect(SnappedLineSegment const &line) const; //intersect with another SnappedLineSegment
+    Geom::LineSegment getLineSegment() const {return Geom::LineSegment(_start_point_of_line, _end_point_of_line);}
+
 private:
-	NR::Point _start_point_of_line;
-	NR::Point _end_point_of_line;    
+    Geom::Point _start_point_of_line;
+    Geom::Point _end_point_of_line;
 };
 
 
-/// Class describing the result of an attempt to snap to an infinite line.
-class SnappedInfiniteLine : public SnappedPoint
+/// Class describing the result of an attempt to snap to a line.
+class SnappedLine : public SnappedPoint
 {
 public:
-  	SnappedInfiniteLine();
-    SnappedInfiniteLine(NR::Point snapped_point, NR::Coord snapped_distance, NR::Point normal_to_line, NR::Point point_on_line);
-    ~SnappedInfiniteLine();
-    Inkscape::SnappedPoint intersect(SnappedInfiniteLine const &line) const; //intersect with another SnappedInfiniteLine
+    SnappedLine();
+    SnappedLine(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, SnapTargetType const &target, Geom::Coord const &snapped_tolerance, bool const &always_snap, Geom::Point const &normal_to_line, Geom::Point const &point_on_line);
+    ~SnappedLine();
+    Inkscape::SnappedPoint intersect(SnappedLine const &line) const; //intersect with another SnappedLine
     // This line is described by this equation:
-    //		a*x + b*y = c  <->  nx*px + ny+py = c  <->  n.p = c
-    NR::Point getNormal() const {return _normal_to_line;} 							// n = (nx, ny)
-    NR::Point getPointOnLine() const {return _point_on_line;}						// p = (px, py)
-    NR::Coord getConstTerm() const {return dot(_normal_to_line, _point_on_line);} 	// c = n.p = nx*px + ny*py;
-	
+    //        a*x + b*y = c  <->  nx*px + ny+py = c  <->  n.p = c
+    Geom::Point getNormal() const {return _normal_to_line;}                             // n = (nx, ny)
+    Geom::Point getPointOnLine() const {return _point_on_line;}                         // p = (px, py)
+    Geom::Coord getConstTerm() const {return dot(_normal_to_line, _point_on_line);}     // c = n.p = nx*px + ny*py;
+    Geom::Line getLine() const {return Geom::Line(_point_on_line, _point_on_line + Geom::rot90(_normal_to_line));}
+
 private:
-	NR::Point _normal_to_line;
-	NR::Point _point_on_line;    
+    Geom::Point _normal_to_line;
+    Geom::Point _point_on_line;
 };
 
 }
 
-bool getClosestSIL(std::list<Inkscape::SnappedInfiniteLine> &list, Inkscape::SnappedInfiniteLine &result);
-bool getClosestIntersectionSIL(std::list<Inkscape::SnappedInfiniteLine> &list, Inkscape::SnappedPoint &result);
-bool getClosestIntersectionSIL(std::list<Inkscape::SnappedInfiniteLine> &list1, std::list<Inkscape::SnappedInfiniteLine> &list2, Inkscape::SnappedPoint &result);
- 
+bool getClosestSLS(std::list<Inkscape::SnappedLineSegment> const &list, Inkscape::SnappedLineSegment &result);
+bool getClosestIntersectionSLS(std::list<Inkscape::SnappedLineSegment> const &list, Inkscape::SnappedPoint &result);
+bool getClosestSL(std::list<Inkscape::SnappedLine> const &list, Inkscape::SnappedLine &result);
+bool getClosestIntersectionSL(std::list<Inkscape::SnappedLine> const &list, Inkscape::SnappedPoint &result);
+bool getClosestIntersectionSL(std::list<Inkscape::SnappedLine> const &list1, std::list<Inkscape::SnappedLine> const &list2, Inkscape::SnappedPoint &result);
+
 
 #endif /* !SEEN_SNAPPEDLINE_H */