diff -r 31de6677aa96 -r 2881c4424190 branchobj.cpp --- a/branchobj.cpp Thu Dec 03 22:32:24 2009 +0000 +++ b/branchobj.cpp Mon Dec 07 21:56:46 2009 +0000 @@ -125,7 +125,7 @@ BranchItem *pi=(BranchItem*)(dsti->parent()); int pi_depth=pi->depth(); - BranchObj* bo=(BranchObj*)dst; + BranchObj* bodst=(BranchObj*)dst; if (!tmpParent) { @@ -138,7 +138,7 @@ link2ParPos=false; else link2ParPos=true; - parObj=bo; + parObj=bodst; setLinkStyle (dst->getDefLinkStyle (dsti)); @@ -146,10 +146,10 @@ // Usually the positioning would be done by reposition(), // but then also the destination branch would "Jump" around... // Better just do it approximately - cout << "BO::setTmp d="<depth(); + cout << "BO::setTmp "; if (dsti->depth()==0) { // new parent is a mapcenter - Vector v= ( m - bo->getChildPos()); + Vector v= ( m - bodst->getChildPos()); if (v.x()<0) v.setX( v.x()-bbox.width() ); v.normalize(); v.scale (100); @@ -161,28 +161,33 @@ if (off==0) { // new parent is just a branch, link to it - QRectF t=bo->getBBoxSizeWithChildren(); + QRectF t=bodst->getBBoxSizeWithChildren(); if (dsti->getLastBranch()) y=t.y() + t.height() ; else y=t.y(); + y=t.bottom(); + cout << " y="<