diff options
Diffstat (limited to 'src/snapped-line.h')
| -rw-r--r-- | src/snapped-line.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/snapped-line.h b/src/snapped-line.h index ea18baefc..3d6668311 100644 --- a/src/snapped-line.h +++ b/src/snapped-line.h @@ -26,13 +26,13 @@ class SnappedLineSegment : public SnappedPoint { public: SnappedLineSegment(); - SnappedLineSegment(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, Geom::Coord const &snapped_tolerance, bool const &always_snap, Geom::Point const &start_point_of_line, Geom::Point const &end_point_of_line); + 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 - + private: Geom::Point _start_point_of_line; - Geom::Point _end_point_of_line; + Geom::Point _end_point_of_line; }; @@ -41,7 +41,7 @@ class SnappedLine : public SnappedPoint { public: SnappedLine(); - SnappedLine(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, Geom::Coord const &snapped_tolerance, bool const &always_snap, Geom::Point const &normal_to_line, Geom::Point const &point_on_line); + 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: @@ -49,10 +49,10 @@ public: 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; - + private: Geom::Point _normal_to_line; - Geom::Point _point_on_line; + Geom::Point _point_on_line; }; } @@ -62,7 +62,7 @@ bool getClosestIntersectionSLS(std::list<Inkscape::SnappedLineSegment> const &li 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 */ |