diff --git a/src/snap.h b/src/snap.h
index c60d866ad34d0bce75a65f667c961f605b82e9c6..9547064a9663e931a48e1a92b1e982b5f4a3329b 100644 (file)
--- a/src/snap.h
+++ b/src/snap.h
#include <libnr/nr-dim2.h>
#include <libnr/nr-forward.h>
#include <libnr/nr-scale.h>
+
#include "guide-snapper.h"
#include "object-snapper.h"
NR::Point const &p,
SPItem const *it) const;
- Inkscape::SnappedPoint freeSnap(Inkscape::Snapper::PointType t,
- NR::Point const &p,
- std::list<SPItem const *> const &it) const;
-
- Inkscape::SnappedPoint freeSnap( Inkscape::Snapper::PointType t,
+ Inkscape::SnappedPoint freeSnap( Inkscape::Snapper::PointType t,
NR::Point const &p,
- std::list<SPItem const *> const &it,
- SnapperList const &snappers ) const;
-
- Inkscape::SnappedPoint freeSnapAlways( Inkscape::Snapper::PointType t,
- NR::Point const &p,
- SPItem const *it,
- SnapperList &snappers );
-
- Inkscape::SnappedPoint freeSnapAlways( Inkscape::Snapper::PointType t,
- NR::Point const &p,
- std::list<SPItem const *> const &it,
- SnapperList &snappers );
+ bool const &first_point,
+ std::vector<NR::Point> &points_to_snap,
+ std::list<SPItem const *> const &it) const;
Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType t,
NR::Point const &p,
Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType t,
NR::Point const &p,
+ bool const &first_point,
+ std::vector<NR::Point> &points_to_snap,
Inkscape::Snapper::ConstraintLine const &c,
std::list<SPItem const *> const &it) const;
+
+ Inkscape::SnappedPoint guideSnap(NR::Point const &p,
+ NR::Point const &guide_normal) const;
std::pair<NR::Point, bool> freeSnapTranslation(Inkscape::Snapper::PointType t,
std::vector<NR::Point> const &p,
NR::Coord const &s,
NR::Point const &o,
NR::Dim2 d) const;
+
+ Inkscape::SnappedPoint guideSnap(NR::Point const &p,
+ Inkscape::ObjectSnapper::DimensionToSnap const snap_dim) const;
+
Inkscape::GuideSnapper guide; ///< guide snapper
Inkscape::ObjectSnapper object; ///< snapper to other objects
void setSnapModeBBox(bool enabled);
void setSnapModeNode(bool enabled);
+ void setSnapModeGuide(bool enabled);
bool getSnapModeBBox() const;
bool getSnapModeNode() const;
-
- void setIncludeItemCenter(bool enabled) {
- _include_item_center = enabled;
- }
-
- bool getIncludeItemCenter() const {
- return _include_item_center;
+ bool getSnapModeGuide() const;
+
+ void setSnapIntersectionGG(bool enabled) {_intersectionGG = enabled;}
+ void setSnapIntersectionLS(bool enabled) {_intersectionLS = enabled;}
+ bool getSnapIntersectionGG() { return _intersectionGG;}
+ bool getSnapIntersectionLS() { return _intersectionLS;}
+
+ void setIncludeItemCenter(bool enabled) {
+ _include_item_center = enabled;
+ // also store a local copy in the object-snapper instead of passing it through many functions
+ object.setIncludeItemCenter(enabled);
}
-
+
+ bool getIncludeItemCenter() const {
+ return _include_item_center;
+ }
+
protected:
SPNamedView const *_named_view;
};
bool _include_item_center; //If true, snapping nodes will also snap the item's center
+ bool _intersectionGG;
+ bool _intersectionLS;
std::pair<NR::Point, bool> _snapTransformed(Inkscape::Snapper::PointType type,
std::vector<NR::Point> const &points,
NR::Point const &origin,
NR::Dim2 dim,
bool uniform) const;
+
+ Inkscape::SnappedPoint findBestSnap(NR::Point const &p, SnappedConstraints &sc) const;
};
#endif /* !SEEN_SNAP_H */