* 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, 4 insertions, 26 deletions

diff --git a/src/libavoid/graph.h b/src/libavoid/graph.h
index d30f394cf..080309d52 100644
--- a/src/libavoid/graph.h
+++ b/src/libavoid/graph.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
@@ -28,20 +28,12 @@
 #include <list>
 #include <utility>
 using std::pair;
-
 #include "libavoid/vertices.h"
 
-
 namespace Avoid {
 
-
-extern bool UseAStarSearch;
-extern bool IgnoreRegions;
-extern bool SelectiveReroute;
-extern bool IncludeEndpoints;
-extern bool UseLeesAlgorithm;
-extern bool InvisibilityGrph;
-extern bool PartialFeedback;
+class ConnRef;
+class Router;
 
 
 typedef std::list<int> ShapeList;
@@ -72,6 +64,7 @@ class EdgeInf
         EdgeInf *lstPrev;
         EdgeInf *lstNext;
     private:
+        Router *_router;
         bool _added;
         bool _visible;
         VertInf *_v1;
@@ -104,21 +97,6 @@ class EdgeList
 };
 
 
-extern EdgeList visGraph;
-extern EdgeList invisGraph;
-
-class ShapeRef;
-
-extern void newBlockingShape(Polygn *poly, int pid);
-extern void checkAllBlockedEdges(int pid);
-extern void checkAllMissingEdges(void);
-extern void generateContains(VertInf *pt);
-extern void adjustContainsWithAdd(const Polygn& poly, const int p_shape);
-extern void adjustContainsWithDel(const int p_shape);
-extern void markConnectors(ShapeRef *shape);
-extern void printInfo(void);
-
-
 }