diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-03-01 01:48:07 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-03-01 01:48:07 +0000 |
| commit | 3ffd21aa6e7c4cf44633f3e1d583097007b3fb80 (patch) | |
| tree | af77c05c53712821d9bb4011f8d168963159aa82 /src/libavoid/router.h | |
| parent | Add some items from Peter Selinger's patch to Potrace 1.7 (diff) | |
| download | inkscape-3ffd21aa6e7c4cf44633f3e1d583097007b3fb80.tar.gz inkscape-3ffd21aa6e7c4cf44633f3e1d583097007b3fb80.zip | |
* src/conn-avoid-ref.cpp, src/libavoid/connector.h,
src/libavoid/shape.cpp, src/libavoid/graph.cpp, src/libavoid/shape.h,
src/libavoid/graph.h, src/libavoid/router.cpp, src/libavoid/router.h,
src/libavoid/connector.cpp, src/libavoid/debug.h:
Some speed improvements and interface cleanups to libavoid.
(bzr r192)
Diffstat (limited to 'src/libavoid/router.h')
| -rw-r--r-- | src/libavoid/router.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libavoid/router.h b/src/libavoid/router.h index bcb4ea67c..4d25b53d4 100644 --- a/src/libavoid/router.h +++ b/src/libavoid/router.h @@ -29,6 +29,8 @@ #include "libavoid/shape.h" #include "libavoid/graph.h" #include "libavoid/timer.h" +#include <list> +#include <utility> #ifdef LINEDEBUG #include <SDL.h> #endif @@ -39,6 +41,7 @@ namespace Avoid { class ConnRef; typedef std::list<ConnRef *> ConnRefList; typedef std::list<unsigned int> IntList; +typedef std::pair<ShapeRef *, Polygn *> MoveInfo; static const unsigned int runningTo = 1; @@ -67,6 +70,7 @@ class Router { bool IncludeEndpoints; bool UseLeesAlgorithm; bool InvisibilityGrph; + bool ConsolidateMoves; bool PartialFeedback; // Instrumentation: @@ -78,7 +82,7 @@ class Router { void addShape(ShapeRef *shape); void delShape(ShapeRef *shape); - ShapeRef *moveShape(ShapeRef *oldShape, Polygn *newPoly, + void moveShape(ShapeRef *shape, Polygn *newPoly, const bool first_move = false); void attachedConns(IntList &conns, const unsigned int shapeId, |