# HG changeset patch
# User insilmaril
# Date 1268667157 0
# Node ID 62d621e3e55063d7bcb352313fe79ab9b8f22764
# Parent  31841b366d5e613da652e0ced7821073e2264b82
Fix for animation of branches using relPos

diff -r 31841b366d5e -r 62d621e3e550 branchobj.cpp
--- a/branchobj.cpp	Mon Mar 15 11:49:42 2010 +0000
+++ b/branchobj.cpp	Mon Mar 15 15:32:37 2010 +0000
@@ -738,7 +738,6 @@
 	anim=ap;
 }
 
-//#include <iostream>
 bool BranchObj::animate()
 {
 	anim.animate ();
diff -r 31841b366d5e -r 62d621e3e550 linkablemapobj.cpp
--- a/linkablemapobj.cpp	Mon Mar 15 11:49:42 2010 +0000
+++ b/linkablemapobj.cpp	Mon Mar 15 15:32:37 2010 +0000
@@ -137,20 +137,21 @@
 {
 	if (parObj)
 	{	
-		relPos.setX (absPos.x() - parObj->getChildPos().x() );
-		relPos.setY (absPos.y() - parObj->getChildPos().y() );
-		parObj->calcBBoxSize();
-	}	
+		setRelPos (absPos - parObj->getChildPos() );
+	}	else
+		qWarning ("LMO::setRelPos() parObj==0");
 }
 
 void LinkableMapObj::setRelPos(const QPointF &p)
 {
-	relPos=p;
 	if (parObj)
 	{		
+		relPos=p;
+		useRelPos=true;
 		parObj->calcBBoxSize();
 		requestReposition();
-	}
+	}	else
+		qWarning ("LMO::setRelPos (p) parObj==0");
 }
 
 QPointF LinkableMapObj::getRelPos()