* src/document.cpp, src/document.h, src/sp-conn-end-pair.cpp,

       src/connector-context.cpp, src/conn-avoid-ref.cpp:

    Keep a seperate connector router for each document.
       
    *  src/libavoid/Makefile_insert, src/libavoid/connector.cpp,
       src/libavoid/connector.h, src/libavoid/debug.h,
       src/libavoid/geometry.cpp, src/libavoid/geometry.h,
       src/libavoid/geomtypes.h, src/libavoid/graph.cpp,
       src/libavoid/graph.h, src/libavoid/incremental.cpp,
       src/libavoid/incremental.h, src/libavoid/libavoid.h,
       src/libavoid/makepath.cpp, src/libavoid/makepath.h,
       src/libavoid/polyutil.cpp, src/libavoid/polyutil.h,
       src/libavoid/router.cpp, src/libavoid/router.h,
       src/libavoid/shape.cpp, src/libavoid/shape.h,
       src/libavoid/static.cpp, src/libavoid/static.h,
       src/libavoid/timer.cpp, src/libavoid/timer.h,
       src/libavoid/vertices.cpp, src/libavoid/vertices.h,
       src/libavoid/visibility.cpp, src/libavoid/visibility.h:
       
    Upstream changes to libavoid that allow multiple connector 
    router instances, as well a few other minor bugfixes.

(bzr r144)

1 files changed, 8 insertions, 10 deletions

diff --git a/src/libavoid/shape.h b/src/libavoid/shape.h
index acdb36983..1960c2256 100644
--- a/src/libavoid/shape.h
+++ b/src/libavoid/shape.h
@@ -2,7 +2,7 @@
  * vim: ts=4 sw=4 et tw=0 wm=0
  *
  * libavoid - Fast, Incremental, Object-avoiding Line Router
- * Copyright (C) 2004-2005  Michael Wybrow <mjwybrow@users.sourceforge.net>
+ * Copyright (C) 2004-2006  Michael Wybrow <mjwybrow@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,23 +29,23 @@
 
 namespace Avoid {
 
-typedef unsigned int uint;
-    
-class ShapeRef;
 class VertInf;
-
+class Router;
+class ShapeRef;
 typedef std::list<ShapeRef *> ShapeRefList;
 
-    
+
 class ShapeRef
 {
     public:
-        ShapeRef(uint id, Polygn& poly);
+        ShapeRef(Router *router, uint id, Polygn& poly);
         ~ShapeRef();
         VertInf *firstVert(void);
         VertInf *lastVert(void);
         uint id(void);
         Polygn poly(void);
+        Router *router(void);
+        void boundingBox(BBox& bbox);
         
         void makeActive(void);
         void makeInactive(void);
@@ -53,6 +53,7 @@ class ShapeRef
         void removeFromGraph(void);
         
     private:
+        Router *_router;
         uint _id;
         Polygn _poly;
         bool _active;
@@ -62,9 +63,6 @@ class ShapeRef
 };
 
 
-extern ShapeRefList shapeRefs;
-
-
 }