diff --git a/src/libavoid/shape.cpp b/src/libavoid/shape.cpp
index 43195080183e19c5a1365f9a51b7509e95ef5a1c..f2fd6d6b30138e3e47a7545841671f55f1d565da 100644 (file)
--- a/src/libavoid/shape.cpp
+++ b/src/libavoid/shape.cpp
* 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
*
*/
+#include <cassert>
+#include "libavoid/shape.h"
#include "libavoid/graph.h" // For alertConns
+#include "libavoid/vertices.h"
#include "libavoid/polyutil.h"
+#include "libavoid/router.h"
namespace Avoid {
-ShapeRefList shapeRefs;
-
-
-ShapeRef::ShapeRef(unsigned int id, Polygn& ply)
- : _id(id)
+ShapeRef::ShapeRef(Router *router, unsigned int id, Polygn& ply)
+ : _router(router)
+ , _id(id)
, _poly(copyPoly(ply))
, _active(false)
, _firstVert(NULL)
VertInf *node = NULL;
for (int pt_i = 0; pt_i < _poly.pn; pt_i++)
{
- node = new VertInf(i, _poly.ps[pt_i]);
+ node = new VertInf(_router, i, _poly.ps[pt_i]);
if (!_firstVert)
{
//node->lstPrev = last;
//last->lstNext = node;
}
- vertices.addVertex(node);
+ _router->vertices.addVertex(node);
last = node;
i++;
// XXX: This could possibly be done less
// safely but faster, all at once.
- vertices.removeVertex(tmp);
+ _router->vertices.removeVertex(tmp);
delete tmp;
}
while (it != _firstVert);
assert(!_active);
// Add to connRefs list.
- _pos = shapeRefs.insert(shapeRefs.begin(), this);
+ _pos = _router->shapeRefs.insert(_router->shapeRefs.begin(), this);
_active = true;
}
assert(_active);
// Remove from connRefs list.
- shapeRefs.erase(_pos);
+ _router->shapeRefs.erase(_pos);
_active = false;
}
}
+Router *ShapeRef::router(void)
+{
+ return _router;
+}
+
+
+void ShapeRef::boundingBox(BBox& bbox)
+{
+ assert(_poly.pn > 0);
+
+ bbox.a = bbox.b = _poly.ps[0];
+ Point& a = bbox.a;
+ Point& b = bbox.b;
+
+ for (int i = 1; i < _poly.pn; ++i)
+ {
+ const Point& p = _poly.ps[i];
+
+ a.x = (p.x < a.x) ? p.x : a.x;
+ a.y = (p.y < a.y) ? p.y : a.y;
+ b.x = (p.x > b.x) ? p.x : b.x;
+ b.y = (p.y > b.y) ? p.y : b.y;
+ }
+}
+
+
void ShapeRef::removeFromGraph(void)
{
for (VertInf *iter = firstVert(); iter != lastVert()->lstNext; )