Fix for animation of branches using relPos
authorinsilmaril
Mon, 15 Mar 2010 15:32:37 +0000
changeset 83662d621e3e550
parent 835 31841b366d5e
child 837 5ecd0462f76b
Fix for animation of branches using relPos
branchobj.cpp
linkablemapobj.cpp
     1.1 --- a/branchobj.cpp	Mon Mar 15 11:49:42 2010 +0000
     1.2 +++ b/branchobj.cpp	Mon Mar 15 15:32:37 2010 +0000
     1.3 @@ -738,7 +738,6 @@
     1.4  	anim=ap;
     1.5  }
     1.6  
     1.7 -//#include <iostream>
     1.8  bool BranchObj::animate()
     1.9  {
    1.10  	anim.animate ();
     2.1 --- a/linkablemapobj.cpp	Mon Mar 15 11:49:42 2010 +0000
     2.2 +++ b/linkablemapobj.cpp	Mon Mar 15 15:32:37 2010 +0000
     2.3 @@ -137,20 +137,21 @@
     2.4  {
     2.5  	if (parObj)
     2.6  	{	
     2.7 -		relPos.setX (absPos.x() - parObj->getChildPos().x() );
     2.8 -		relPos.setY (absPos.y() - parObj->getChildPos().y() );
     2.9 -		parObj->calcBBoxSize();
    2.10 -	}	
    2.11 +		setRelPos (absPos - parObj->getChildPos() );
    2.12 +	}	else
    2.13 +		qWarning ("LMO::setRelPos() parObj==0");
    2.14  }
    2.15  
    2.16  void LinkableMapObj::setRelPos(const QPointF &p)
    2.17  {
    2.18 -	relPos=p;
    2.19  	if (parObj)
    2.20  	{		
    2.21 +		relPos=p;
    2.22 +		useRelPos=true;
    2.23  		parObj->calcBBoxSize();
    2.24  		requestReposition();
    2.25 -	}
    2.26 +	}	else
    2.27 +		qWarning ("LMO::setRelPos (p) parObj==0");
    2.28  }
    2.29  
    2.30  QPointF LinkableMapObj::getRelPos()