diff --git a/src/line-snapper.h b/src/line-snapper.h
index 3a7ed6aae23b59331858b494b950e51bfc4531d9..cdc45c286bce947b2cb86904c88f7095025702db 100644 (file)
--- a/src/line-snapper.h
+++ b/src/line-snapper.h
*
* Authors:
* Carl Hetherington <inkscape@carlh.net>
- * Diederik van Lierop <mail@diedenrezi.nl>
+ * Diederik van Lierop <mail@diedenrezi.nl>
*
* Copyright (C) 1999-2008 Authors
*
namespace Inkscape
{
+class SnapCandidatePoint;
class LineSnapper : public Snapper
{
LineSnapper(SnapManager *sm, Geom::Coord const d);
void freeSnap(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
- Geom::Point const &p,
- SnapSourceType const &source_type,
- bool const &first_point,
+ Inkscape::SnapCandidatePoint const &p,
Geom::OptRect const &bbox_to_snap,
std::vector<SPItem const *> const *it,
- std::vector<std::pair<Geom::Point, int> > *unselected_nodes) const;
+ std::vector<Inkscape::SnapCandidatePoint> *unselected_nodes) const;
void constrainedSnap(SnappedConstraints &sc,
- Inkscape::SnapPreferences::PointType const &t,
- Geom::Point const &p,
- SnapSourceType const &source_type,
- bool const &first_point,
+ Inkscape::SnapCandidatePoint const &p,
Geom::OptRect const &bbox_to_snap,
- ConstraintLine const &c,
- std::vector<SPItem const *> const *it) const;
+ SnapConstraint const &c,
+ std::vector<SPItem const *> const *it,
+ std::vector<SnapCandidatePoint> *unselected_nodes) const;
protected:
typedef std::list<std::pair<Geom::Point, Geom::Point> > LineList;
*/
virtual LineList _getSnapLines(Geom::Point const &p) const = 0;
- virtual void _addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, SnapTargetType const &target, Geom::Point const normal_to_line, Geom::Point const point_on_line) const = 0;
+ virtual void _addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const normal_to_line, Geom::Point const point_on_line) const = 0;
+
+ // Will only be implemented for guide lines, because grid lines don't have an origin
+ virtual void _addSnappedLinesOrigin(SnappedConstraints &sc, Geom::Point const origin, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const;
+
+ virtual void _addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const = 0;
};
}