From 618fe74db3717f5c37f7a51d0d6df95776efbfe1 Mon Sep 17 00:00:00 2001 From: mjwybrow Date: Wed, 15 Feb 2006 13:25:54 +0000 Subject: * 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) --- src/libavoid/incremental.cpp | 139 ------------------------------------------- 1 file changed, 139 deletions(-) delete mode 100644 src/libavoid/incremental.cpp (limited to 'src/libavoid/incremental.cpp') diff --git a/src/libavoid/incremental.cpp b/src/libavoid/incremental.cpp deleted file mode 100644 index f7d48ac70..000000000 --- a/src/libavoid/incremental.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/* - * vim: ts=4 sw=4 et tw=0 wm=0 - * - * libavoid - Fast, Incremental, Object-avoiding Line Router - * Copyright (C) 2004-2005 Michael Wybrow - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ - -#include "libavoid/connector.h" -#include "libavoid/graph.h" -#include "libavoid/visibility.h" - -namespace Avoid { - - -void addShape(ShapeRef *shape) -{ - unsigned int pid = shape->id(); - Polygn poly = shape->poly(); - - adjustContainsWithAdd(poly, pid); - - // o Check all visibility edges to see if this one shape - // blocks them. - newBlockingShape(&poly, pid); - - // o Calculate visibility for the new vertices. - if (UseLeesAlgorithm) - { - shapeVisSweep(shape); - } - else - { - shapeVis(shape); - } - callbackAllInvalidConnectors(); -} - - -void delShape(ShapeRef *shape) -{ - unsigned int pid = shape->id(); - - // o Remove entries related to this shape's vertices - shape->removeFromGraph(); - - if (SelectiveReroute) - { - markConnectors(shape); - } - - adjustContainsWithDel(pid); - - delete shape; - - // o Check all edges that were blocked by this shape. - if (InvisibilityGrph) - { - checkAllBlockedEdges(pid); - } - else - { - // check all edges not in graph - checkAllMissingEdges(); - } - callbackAllInvalidConnectors(); -} - - -ShapeRef *moveShape(ShapeRef *oldShape, Polygn *newPoly, const bool first_move) -{ - unsigned int pid = oldShape->id(); - - // o Remove entries related to this shape's vertices - oldShape->removeFromGraph(); - - if (SelectiveReroute && (!(PartialFeedback && PartialTime) || first_move)) - { - markConnectors(oldShape); - } - - adjustContainsWithDel(pid); - - delete oldShape; - oldShape = NULL; - - adjustContainsWithAdd(*newPoly, pid); - - // o Check all edges that were blocked by this shape. - if (InvisibilityGrph) - { - checkAllBlockedEdges(pid); - } - else - { - // check all edges not in graph - checkAllMissingEdges(); - } - - ShapeRef *newShape = new ShapeRef(pid, *newPoly); - - // o Check all visibility edges to see if this one shape - // blocks them. - if (!(PartialFeedback && PartialTime)) - { - newBlockingShape(newPoly, pid); - } - - // o Calculate visibility for the new vertices. - if (UseLeesAlgorithm) - { - shapeVisSweep(newShape); - } - else - { - shapeVis(newShape); - } - callbackAllInvalidConnectors(); - - return newShape; -} - - -} - -- cgit v1.2.3