diff -r 16af22e2c155 -r 865186671361 branchobj.cpp
--- a/branchobj.cpp	Tue Apr 08 08:28:37 2008 +0000
+++ b/branchobj.cpp	Wed May 14 14:11:33 2008 +0000
@@ -1307,12 +1307,14 @@
 	qreal th = bboxTotal.height();	
 // TODO testing
 /*
-	cout << "BO::alignRelTo "<<qPrintable (getHeading())<<endl;
-	cout << "  d="<<depth<<
+	QPointF pp; if (parObj) pp=parObj->getChildPos();
+	cout << "BO::alignRelTo "<<qPrintable (getHeading());
+	cout << "    d="<<depth<<
 		"  ref="<<ref<<
 //		"  bbox.topLeft="<<bboxTotal.topLeft()<<
 		"  absPos="<<absPos<<
 		"  relPos="<<relPos<<
+		"  parPos="<<pp<<
 		"  orient="<<orientation<<
 //		"  pad="<<topPad<<","<<botPad<<","<<leftPad<<","<<rightPad<<
 //		"  hidden="<<hidden<<
@@ -1341,20 +1343,27 @@
     {
 		// Align myself depending on orientation and parent, but
 		// only if I am not a mainbranch or mapcenter itself
-		LinkableMapObj::Orientation o;
-		o=parObj->getOrientation();
-		switch (orientation) 
+
+		if (anim.isAnimated())
 		{
-			case LinkableMapObj::LeftOfCenter:
-				move (ref.x() - bbox.width(), ref.y() + (th-bbox.height())/2 );
-			break;
-			case LinkableMapObj::RightOfCenter:	
-				move (ref.x() , ref.y() + (th-bbox.height())/2  );
-			break;
-			default:
-				qWarning ("LMO::alignRelativeTo: oops, no orientation given...");
-			break;
-		}		
+			move2RelPos(anim);
+		} else
+		{
+			LinkableMapObj::Orientation o;
+			o=parObj->getOrientation();
+			switch (orientation) 
+			{
+				case LinkableMapObj::LeftOfCenter:
+					move (ref.x() - bbox.width(), ref.y() + (th-bbox.height())/2 );
+				break;
+				case LinkableMapObj::RightOfCenter:	
+					move (ref.x() , ref.y() + (th-bbox.height())/2  );
+				break;
+				default:
+					qWarning ("LMO::alignRelativeTo: oops, no orientation given...");
+				break;
+			}	
+		}
     }		
 
 	if (scrolled) return;
@@ -1592,9 +1601,15 @@
 	return mapEditor->getModel()->getSelectString (this);
 }
 
-void BranchObj::animate()
+void BranchObj::setAnimation(const AnimPoint &ap)
 {
-	//relPos.animate();
-	cout << "BO::animate  x,y="<<relPos.x()<<","<<relPos.y()<<endl;
+	anim=ap;
 }
 
+bool BranchObj::animate()
+{
+	anim.animate ();
+	setRelPos (anim);
+	return anim.isAnimated();
+}
+