![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/object-snapper.h b/src/object-snapper.h
index 9a6978d4705e5c305d2b8f99ea4e1aeabaae7217..6bde3dd391a531fd7fc75bea43b0df780e67903d 100644 (file)
--- a/src/object-snapper.h
+++ b/src/object-snapper.h
#include "snapper.h"
#include "sp-path.h"
#include "splivarot.h"
+#include "snap-candidate.h"
struct SPNamedView;
struct SPItem;
namespace Inkscape
{
-class SnapCandidate
-
+class ObjectSnapper : public Snapper
{
+
public:
- SnapCandidate(SPItem* item, bool clip_or_mask, Geom::Matrix _additional_affine);
- ~SnapCandidate();
+ ObjectSnapper(SnapManager *sm, Geom::Coord const d);
+ ~ObjectSnapper();
- SPItem* item; // An item that is to be considered for snapping to
- bool clip_or_mask; // If true, then item refers to a clipping path or a mask
+ void guideFreeSnap(SnappedConstraints &sc,
+ Geom::Point const &p,
+ Geom::Point const &guide_normal) const;
- /* To find out the absolute position of a clipping path or mask, we not only need to know
- * the transformation of the clipping path or mask itself, but also the transformation of
- * the object to which the clip or mask is being applied; that transformation is stored here
- */
- Geom::Matrix additional_affine;
-};
+ void guideConstrainedSnap(SnappedConstraints &sc,
+ Geom::Point const &p,
+ Geom::Point const &guide_normal,
+ SnapConstraint const &c) const;
-class ObjectSnapper : public Snapper
-{
+ bool ThisSnapperMightSnap() const;
-public:
- ObjectSnapper(SnapManager *sm, Geom::Coord const d);
- ~ObjectSnapper();
+ Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom)
+ bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance
- enum DimensionToSnap {
- GUIDE_TRANSL_SNAP_X, // For snapping a vertical guide (normal in the X-direction) to objects,
- GUIDE_TRANSL_SNAP_Y, // For snapping a horizontal guide (normal in the Y-direction) to objects
- ANGLED_GUIDE_TRANSL_SNAP, // For snapping an angled guide, while translating it accross the desktop
- ANGLED_GUIDE_ROT_SNAP, // For snapping an angled guide, while rotating it around some pivot point
- TRANSL_SNAP_XY}; // All other cases; for snapping to objects, other than guides
-
- void guideSnap(SnappedConstraints &sc,
- Geom::Point const &p,
- Geom::Point const &guide_normal) const;
-
- bool ThisSnapperMightSnap() const;
- bool GuidesMightSnap() const;
-
- Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom)
- bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance
-
- void freeSnap(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
- Geom::Point const &p,
- bool const &first_point,
- Geom::OptRect const &bbox_to_snap,
- std::vector<SPItem const *> const *it,
- std::vector<Geom::Point> *unselected_nodes) const;
-
- void constrainedSnap(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
- Geom::Point const &p,
- bool const &first_point,
- Geom::OptRect const &bbox_to_snap,
- ConstraintLine const &c,
- std::vector<SPItem const *> const *it) const;
+ void freeSnap(SnappedConstraints &sc,
+ Inkscape::SnapCandidatePoint const &p,
+ Geom::OptRect const &bbox_to_snap,
+ std::vector<SPItem const *> const *it,
+ std::vector<SnapCandidatePoint> *unselected_nodes) const;
+
+ void constrainedSnap(SnappedConstraints &sc,
+ Inkscape::SnapCandidatePoint const &p,
+ Geom::OptRect const &bbox_to_snap,
+ SnapConstraint const &c,
+ std::vector<SPItem const *> const *it,
+ std::vector<SnapCandidatePoint> *unselected_nodes) const;
private:
//store some lists of candidates, points and paths, so we don't have to rebuild them for each point we want to snap
- std::vector<SnapCandidate> *_candidates;
- std::vector<Geom::Point> *_points_to_snap_to;
- std::vector<std::pair<Geom::PathVector*, SnapTargetType> > *_paths_to_snap_to;
+ std::vector<SnapCandidateItem> *_candidates;
+ std::vector<SnapCandidatePoint> *_points_to_snap_to;
+ std::vector<SnapCandidatePath > *_paths_to_snap_to;
void _findCandidates(SPObject* parent,
std::vector<SPItem const *> const *it,
bool const &first_point,
Geom::Rect const &bbox_to_snap,
- DimensionToSnap snap_dim,
bool const _clip_or_mask,
Geom::Matrix const additional_affine) const;
void _snapNodes(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
- Geom::Point const &p, // in desktop coordinates
- bool const &first_point,
- std::vector<Geom::Point> *unselected_nodes) const; // in desktop coordinates
+ Inkscape::SnapCandidatePoint const &p, // in desktop coordinates
+ std::vector<SnapCandidatePoint> *unselected_nodes,
+ SnapConstraint const &c = SnapConstraint(),
+ Geom::Point const &p_proj_on_constraint = Geom::Point()) const;
- void _snapTranslatingGuideToNodes(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
+ void _snapTranslatingGuide(SnappedConstraints &sc,
Geom::Point const &p,
Geom::Point const &guide_normal) const;
- void _collectNodes(Inkscape::SnapPreferences::PointType const &t,
+ void _collectNodes(Inkscape::SnapSourceType const &t,
bool const &first_point) const;
void _snapPaths(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
- Geom::Point const &p, // in desktop coordinates
- bool const &first_point,
- std::vector<Geom::Point> *unselected_nodes, // in desktop coordinates
+ Inkscape::SnapCandidatePoint const &p, // in desktop coordinates
+ std::vector<Inkscape::SnapCandidatePoint> *unselected_nodes, // in desktop coordinates
SPPath const *selected_path) const;
void _snapPathsConstrained(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
- Geom::Point const &p, // in desktop coordinates
- bool const &first_point,
- ConstraintLine const &c) const;
+ Inkscape::SnapCandidatePoint const &p, // in desktop coordinates
+ SnapConstraint const &c,
+ Geom::Point const &p_proj_on_constraint) const;
- bool isUnselectedNode(Geom::Point const &point, std::vector<Geom::Point> const *unselected_nodes) const;
+ bool isUnselectedNode(Geom::Point const &point, std::vector<Inkscape::SnapCandidatePoint> const *unselected_nodes) const;
- void _collectPaths(Inkscape::SnapPreferences::PointType const &t,
- bool const &first_point) const;
+ void _collectPaths(Geom::Point p,
+ Inkscape::SnapSourceType const source_type,
+ bool const &first_point) const;
void _clear_paths() const;
Geom::PathVector* _getBorderPathv() const;
Geom::PathVector* _getPathvFromRect(Geom::Rect const rect) const;
- void _getBorderNodes(std::vector<Geom::Point> *points) const;
+ void _getBorderNodes(std::vector<SnapCandidatePoint> *points) const;
}; // end of ObjectSnapper class
-void getBBoxPoints(Geom::OptRect const bbox, std::vector<Geom::Point> *points, bool const includeCorners, bool const includeLineMidpoints, bool const includeObjectMidpoints);
+void getBBoxPoints(Geom::OptRect const bbox, std::vector<SnapCandidatePoint> *points, bool const isTarget, bool const includeCorners, bool const includeLineMidpoints, bool const includeObjectMidpoints);
} // end of namespace Inkscape