diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2011-09-18 17:09:29 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mail@diedenrezi.nl> | 2011-09-18 17:09:29 +0000 |
| commit | 344d9e8077c05b86e7d423b5db163b3e3e541032 (patch) | |
| tree | 1734ecbec437e8d5d381989dc499d49fc656f859 /src/snapped-curve.h | |
| parent | German translation update (diff) | |
| download | inkscape-344d9e8077c05b86e7d423b5db163b3e3e541032.tar.gz inkscape-344d9e8077c05b86e7d423b5db163b3e3e541032.zip | |
Snap to guide-path intersections, and don't snap to paths when only path intersections are asked for
Fixed bugs:
- https://launchpad.net/bugs/847457
- https://launchpad.net/bugs/850982
(bzr r10639)
Diffstat (limited to 'src/snapped-curve.h')
| -rw-r--r-- | src/snapped-curve.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/snapped-curve.h b/src/snapped-curve.h index ed04576df..8b1080dc4 100644 --- a/src/snapped-curve.h +++ b/src/snapped-curve.h @@ -14,6 +14,7 @@ #include <vector> #include <list> #include "snapped-point.h" +#include "snapped-line.h" #include <2geom/forward.h> namespace Inkscape @@ -27,6 +28,7 @@ public: SnappedCurve(Geom::Point const &snapped_point, int num_path, int num_segm, Geom::Coord const &snapped_distance, Geom::Coord const &snapped_tolerance, bool const &always_snap, bool const &fully_constrained, Geom::Curve const *curve, SnapSourceType source, long source_num, SnapTargetType target, Geom::OptRect target_bbox); ~SnappedCurve(); Inkscape::SnappedPoint intersect(SnappedCurve const &curve, Geom::Point const &p, Geom::Affine dt2doc) const; //intersect with another SnappedCurve + Inkscape::SnappedPoint intersect(SnappedLine const &line, Geom::Point const &p, Geom::Affine dt2doc) const; //intersect with a SnappedLine private: Geom::Curve const *_curve; @@ -36,8 +38,9 @@ private: } -bool getClosestCurve(std::list<Inkscape::SnappedCurve> const &list, Inkscape::SnappedCurve &result); +bool getClosestCurve(std::list<Inkscape::SnappedCurve> const &list, Inkscape::SnappedCurve &result, bool exclude_paths = false); bool getClosestIntersectionCS(std::list<Inkscape::SnappedCurve> const &list, Geom::Point const &p, Inkscape::SnappedPoint &result, Geom::Affine dt2doc); +bool getClosestIntersectionCL(std::list<Inkscape::SnappedCurve> const &list1, std::list<Inkscape::SnappedLine> const &list2, Geom::Point const &p, Inkscape::SnappedPoint &result, Geom::Affine dt2doc); #endif /* !SEEN_SNAPPEDCURVE_H */ |