* 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, 17 insertions, 11 deletions

diff --git a/src/libavoid/vertices.cpp b/src/libavoid/vertices.cpp
index 7e74509f0..786919581 100644
--- a/src/libavoid/vertices.cpp
+++ b/src/libavoid/vertices.cpp
@@ -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
@@ -20,18 +20,20 @@
  *
 */
 
+#include "libavoid/vertices.h"
 #include "libavoid/geometry.h"
 #include "libavoid/graph.h"  // For alertConns
 #include "libavoid/debug.h"
+#include "libavoid/router.h"
 
+#include <iostream>
+#include <cstdlib>
+#include <cassert>
 
 
 namespace Avoid {
 
 
-ContainsMap contains;
-
-
 VertID::VertID()
 {
 }
@@ -134,8 +136,9 @@ const int VertID::src = 1;
 const int VertID::tar = 2;
 
 
-VertInf::VertInf(const VertID& vid, const Point& vpoint)
-    : id(vid)
+VertInf::VertInf(Router *router, const VertID& vid, const Point& vpoint)
+    : _router(router)
+    , id(vid)
     , point(vpoint)
     , lstPrev(NULL)
     , lstNext(NULL)
@@ -195,6 +198,11 @@ bool directVis(VertInf *src, VertInf *dst)
     VertID& pID = src->id;
     VertID& qID = dst->id;
 
+    // We better be part of the same instance of libavoid.
+    Router *router = src->_router;
+    assert(router == dst->_router);
+
+    ContainsMap& contains = router->contains;
     if (!(pID.isShape))
     {
         ss.insert(contains[pID].begin(), contains[pID].end());
@@ -206,8 +214,9 @@ bool directVis(VertInf *src, VertInf *dst)
 
     // The "beginning" should be the first shape vertex, rather
     // than an endpoint, which are also stored in "vertices".
-    VertInf *endVert = vertices.end();
-    for (VertInf *k = vertices.shapesBegin(); k != endVert; k = k->lstNext)
+    VertInf *endVert = router->vertices.end();
+    for (VertInf *k = router->vertices.shapesBegin(); k != endVert;
+            k = k->lstNext)
     {
         if ((ss.find(k->id.objID) == ss.end()))
         {
@@ -430,9 +439,6 @@ VertInf *VertInfList::end(void)
 }
 
 
-VertInfList vertices;
-
-
 }