diff -r d0e047b8d412 -r 367d875453ed vymmodel.cpp
--- a/vymmodel.cpp	Wed Jan 16 15:45:20 2008 +0000
+++ b/vymmodel.cpp	Wed Feb 27 16:09:06 2008 +0000
@@ -16,9 +16,8 @@
 
 void VymModel::clear() 
 {
-	for (int i=0; i<mapCenters.count(); i++)
-		mapCenters.at(i)->clear();
-	mapCenters.clear();	
+	while (!mapCenters.isEmpty())
+		delete mapCenters.takeFirst();
 }
 
 void VymModel::init () 
@@ -116,6 +115,7 @@
 	BranchObj *bo=bo_start;
 	if (bo)
 	{
+		// Try to find next branch in current MapCenter
 		rbo=bo->next();
 		if (rbo) return rbo;
 
@@ -216,6 +216,70 @@
 		mapCenters.at(i)->reposition();	//	for positioning heading
 }
 
+QPolygonF VymModel::shape(BranchObj *bo)
+{
+	// Creating (arbitrary) shapes
+
+	QPolygonF p;
+	QRectF rb=bo->getBBox();
+	if (bo->getDepth()==0)
+	{
+		// Just take BBox of this mapCenter
+		p<<rb.topLeft()<<rb.topRight()<<rb.bottomRight()<<rb.bottomLeft();
+		return p;
+	}
+
+	// Take union of BBox and TotalBBox 
+
+	QRectF ra=bo->getTotalBBox();
+	if (bo->getOrientation()==LinkableMapObj::LeftOfCenter)
+		p   <<ra.bottomLeft()
+			<<ra.topLeft()
+			<<QPointF (rb.topLeft().x(), ra.topLeft().y() )
+			<<rb.topRight()
+			<<rb.bottomRight()
+			<<QPointF (rb.bottomLeft().x(), ra.bottomLeft().y() ) ;
+	else		
+		p   <<ra.bottomRight()
+			<<ra.topRight()
+			<<QPointF (rb.topRight().x(), ra.topRight().y() )
+			<<rb.topLeft()
+			<<rb.bottomLeft()
+			<<QPointF (rb.bottomRight().x(), ra.bottomRight().y() ) ;
+	return p;		
+
+}
+
+void VymModel::moveAway(LinkableMapObj *lmo)
+{
+	// Autolayout:
+	//
+	// Move all branches and MapCenters away from lmo 
+	// to avoid collisions 
+
+	// 
+
+
+	QPolygonF pA;
+	QPolygonF pB;
+
+	BranchObj *boA=(BranchObj*)lmo;
+	BranchObj *boB;
+	for (int i=0; i<mapCenters.count(); i++)
+	{
+		boB=mapCenters.at(i);
+		pA=shape (boA);
+		pB=shape (boB);
+		PolygonCollisionResult r = PolygonCollision(pA, pB, QPoint(0,0));
+		cout <<"------->"
+			<<"="<<r.intersect
+			<<"  ("<<qPrintable(boA->getHeading() )<<")"
+			<<"  with ("<< qPrintable (boB->getHeading() )
+			<<")  willIntersect"
+			<<r.willIntersect 
+			<<"  minT="<<r.minTranslation<<endl<<endl;
+	}
+}
 
 
 //////////////////////////////////////////////