Connector tool: make connectors avoid the convex hull of shapes.

[inkscape.git] / src / line-snapper.h

diff --git a/src/line-snapper.h b/src/line-snapper.h
index 91e8ca596d8e2d2188d0b36c795c603eb19fad0b..4ad08a99f95fe1f73ab8dbeb739569a32caadd23 100644 (file)
--- a/src/line-snapper.h
+++ b/src/line-snapper.h
@@ -7,7 +7,7 @@
  *
  *    Authors:
  *      Carl Hetherington <inkscape@carlh.net>
- *             Diederik van Lierop <mail@diedenrezi.nl>
+ *      Diederik van Lierop <mail@diedenrezi.nl>
  *
  *       Copyright (C) 1999-2008 Authors
  *
@@ -27,14 +27,16 @@ public:
   void freeSnap(SnappedConstraints &sc,
                    Inkscape::SnapPreferences::PointType const &t,
                    Geom::Point const &p,
+                   SnapSourceType const &source_type,
                    bool const &first_point,
                    Geom::OptRect const &bbox_to_snap,
                    std::vector<SPItem const *> const *it,
-                   std::vector<Geom::Point> *unselected_nodes) const;
+                   std::vector<std::pair<Geom::Point, int> > *unselected_nodes) const;
 
   void constrainedSnap(SnappedConstraints &sc,
                           Inkscape::SnapPreferences::PointType const &t,
                           Geom::Point const &p,
+                          SnapSourceType const &source_type,
                           bool const &first_point,
                           Geom::OptRect const &bbox_to_snap,
                           ConstraintLine const &c,
@@ -52,7 +54,12 @@ private:
    */
   virtual LineList _getSnapLines(Geom::Point const &p) const = 0;
 
-  virtual void _addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, 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, 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) const;
+
+  virtual void _addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source) const = 0;
 };
 
 }