# HG changeset patch
# User insilmaril
# Date 1209995202 0
# Node ID d0086df58648106f405c68a9db582f3437b7bb26
# Parent  1973a58f390086a037d8e12f750d2d6adf18c8aa
Some code cleanup and experimental stuff to support animations later

diff -r 1973a58f3900 -r d0086df58648 animpoint.cpp
--- a/animpoint.cpp	Thu Apr 10 19:56:11 2008 +0000
+++ b/animpoint.cpp	Mon May 05 13:46:42 2008 +0000
@@ -1,5 +1,7 @@
 #include "animpoint.h"
 
+#include <math.h>
+
 AnimPoint::AnimPoint()
 {
 	init();
@@ -27,6 +29,8 @@
 {
     if (rx() != other.rx() ) return false;
     if (ry() != other.ry() ) return false;
+	if (startPos != other.startPos) return false;
+	if (destPos  != other.destPos) return false;
     if (animated != other.animated ) return false;
 
 	return true;
@@ -35,24 +39,62 @@
 void AnimPoint::init ()
 {
 	animated=false;
+	n=0;
+	startPos=QPointF(0,0);
+	destPos=QPointF(0,0);
+	vector=QPointF(0,0);
+	animTicks=10;
 }
 
 void AnimPoint::copy (AnimPoint other)
 {
 	setX (other.x() );
 	setY (other.x() );
+	startPos=other.startPos;
+	destPos=other.destPos;
+	vector=other.vector;
 	animated=other.animated;
+	n=other.n;
+	animTicks=other.animTicks;
+}
+
+void AnimPoint::setStart(const QPointF &p)
+{
+	startPos=p;
+	initVector();
+}
+
+QPointF AnimPoint::getStart()
+{
+	return startPos;
 }
 
 
 void AnimPoint::setDest(const QPointF &p)
 {
 	destPos=p;
+	initVector();
+}
+
+QPointF AnimPoint::getDest()
+{
+	return destPos;
+}
+
+void AnimPoint::setTicks (const uint &t)
+{
+	animTicks=t;
+}
+
+uint AnimPoint::getTicks()
+{
+	return animTicks;
 }
 
 void AnimPoint::setAnimated(bool b)
 {
 	animated=b;
+	if (b) n=0;
 }
 
 bool AnimPoint::isAnimated()
@@ -60,11 +102,30 @@
 	return animated;
 }
 
-void AnimPoint::animate()
+bool AnimPoint::animate()
 {
-	setX (x()+1);
-	setY (y()+1);
+	if (!animated) return animated;
+	n++;
+	if (n>animTicks)
+	{
+		vector=QPointF(0,0);
+		animated=false;
+		return animated;
+	}
+
+	setX (startPos.x() + vector.x()*sqrt(n/animTicks) );
+	setY (startPos.y() + vector.y()*sqrt(n/animTicks) );
+	/*
+	setX (startPos.x() + vector.x()*(n/animTicks) );
+	setY (startPos.y() + vector.y()*(n/animTicks) );
+	*/
+	return animated;
 }
 
+void AnimPoint::initVector()
+{
+	vector.setX (destPos.x()-startPos.x() );
+	vector.setY (destPos.y()-startPos.y() );
+}
 
 
diff -r 1973a58f3900 -r d0086df58648 animpoint.h
--- a/animpoint.h	Thu Apr 10 19:56:11 2008 +0000
+++ b/animpoint.h	Mon May 05 13:46:42 2008 +0000
@@ -13,15 +13,24 @@
 	bool operator== ( AnimPoint  );
 	void init();
 	void copy(AnimPoint other);
+	void setStart (const QPointF &);
+	QPointF getStart();
 	void setDest (const QPointF &);
+	QPointF getDest();
+	void setTicks (const uint &t);
+	uint getTicks();
 	void setAnimated(bool);
 	bool isAnimated ();
-	void animate();
+	bool animate();
 
 private:
-	QPointF currentPos;
+	void initVector();
+
+	QPointF startPos;
 	QPointF destPos;
+	QPointF vector;
 	qreal n;
+	qreal animTicks;
     bool animated;
 
 };
diff -r 1973a58f3900 -r d0086df58648 branchobj.cpp
--- a/branchobj.cpp	Thu Apr 10 19:56:11 2008 +0000
+++ b/branchobj.cpp	Mon May 05 13:46:42 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();
+}
+
diff -r 1973a58f3900 -r d0086df58648 branchobj.h
--- a/branchobj.h	Thu Apr 10 19:56:11 2008 +0000
+++ b/branchobj.h	Mon May 05 13:46:42 2008 +0000
@@ -128,7 +128,8 @@
     virtual void select();
     virtual void unselect();
 	virtual QString getSelectString();
-	virtual void animate();
+	virtual void setAnimation(const AnimPoint &ap);
+	virtual bool animate();
 
 protected:
 	static BranchObj* itLast;		// iterator for first(), next()
@@ -136,6 +137,9 @@
     QList<BranchObj*> branch;		// all child branches
 	QList<FloatImageObj*> floatimage;// child images
 	QList<XLinkObj*> xlink;			// xlinks to other branches
+
+	AnimPoint anim;
+
 public:	
 	float angle;					// used in mainbranch to reorder mainbranches
 protected:	
diff -r 1973a58f3900 -r d0086df58648 exports.cpp
--- a/exports.cpp	Thu Apr 10 19:56:11 2008 +0000
+++ b/exports.cpp	Mon May 05 13:46:42 2008 +0000
@@ -185,9 +185,8 @@
 			if (!bo->getNote().isEmpty())
 			{
 				curIndent +="  | ";
-				s =curIndent + bo->getNoteASCII( curIndent, 80);
-				s=s.replace ("\n","\n"+curIndent);
-				ts << QString (s+"\n");
+				s=bo->getNoteASCII( curIndent, 80);
+				ts << s;
 			}
 		}
 		bo=model->next(bo);
diff -r 1973a58f3900 -r d0086df58648 exportxhtmldialog.ui
--- a/exportxhtmldialog.ui	Thu Apr 10 19:56:11 2008 +0000
+++ b/exportxhtmldialog.ui	Mon May 05 13:46:42 2008 +0000
@@ -162,7 +162,7 @@
        <item>
         <widget class="QCheckBox" name="warningsButton" >
          <property name="text" >
-          <string>showWarnings e.g. if directory is not empty</string>
+          <string>show warnings of xslt processor</string>
          </property>
         </widget>
        </item>