diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2007-11-03 14:48:50 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2007-11-03 14:48:50 +0000 |
| commit | 84504bd815a6ef3c5b7b5958ce46429cbab56a66 (patch) | |
| tree | d74ae924d96f98b07658dcb67d46b64c486d1beb /src/object-snapper.h | |
| parent | Added an icons file with a cleaned up current icon set (prefix "ink_" in thei... (diff) | |
| download | inkscape-84504bd815a6ef3c5b7b5958ce46429cbab56a66.tar.gz inkscape-84504bd815a6ef3c5b7b5958ce46429cbab56a66.zip | |
Groundwork to snap to intersections, e.g. intersections of gridlines with guidelines, and of objects with other objects. The snappers used to return only SnappedPoints, but now also SnappedLines and SnappedInfiniteLines can be returned. SnappedPaths will be implemented later.
(bzr r4016)
Diffstat (limited to 'src/object-snapper.h')
| -rw-r--r-- | src/object-snapper.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/object-snapper.h b/src/object-snapper.h index e473e3fe9..5b2e6f37d 100644 --- a/src/object-snapper.h +++ b/src/object-snapper.h @@ -17,7 +17,6 @@ #include "sp-path.h" #include "splivarot.h" - struct SPNamedView; struct SPItem; struct SPObject; @@ -88,13 +87,15 @@ private: std::vector<SPItem*> *_candidates; std::vector<NR::Point> *_points_to_snap_to; std::vector<Path*> *_paths_to_snap_to; - SnappedPoint _doFreeSnap(Inkscape::Snapper::PointType const &t, + void _doFreeSnap(SnappedConstraints &sc, + Inkscape::Snapper::PointType const &t, NR::Point const &p, bool const &first_point, std::vector<NR::Point> &points_to_snap, std::list<SPItem const *> const &it) const; - SnappedPoint _doConstrainedSnap(Inkscape::Snapper::PointType const &t, + void _doConstrainedSnap(SnappedConstraints &sc, + Inkscape::Snapper::PointType const &t, NR::Point const &p, bool const &first_point, std::vector<NR::Point> &points_to_snap, @@ -107,13 +108,13 @@ private: std::vector<NR::Point> &points_to_snap, DimensionToSnap const snap_dim) const; - void _snapNodes(Inkscape::Snapper::PointType const &t, + bool _snapNodes(Inkscape::Snapper::PointType const &t, Inkscape::SnappedPoint &s, NR::Point const &p, bool const &first_point, DimensionToSnap const snap_dim) const; - void _snapPaths(Inkscape::Snapper::PointType const &t, + bool _snapPaths(Inkscape::Snapper::PointType const &t, Inkscape::SnappedPoint &s, NR::Point const &p, bool const &first_point) const; |