# HG changeset patch
# User insilmaril
# Date 1240836126 0
# Node ID c6908bc17d7810d9a3e578347b5fda57ec6c00b9
# Parent  a8a5c7288f5710918b7f5a1a4f8be3cd84507ee0
minor fixes and cleanups

diff -r a8a5c7288f57 -r c6908bc17d78 branchobj.cpp
--- a/branchobj.cpp	Mon Apr 27 12:07:15 2009 +0000
+++ b/branchobj.cpp	Mon Apr 27 12:42:06 2009 +0000
@@ -48,6 +48,8 @@
 
 BranchObj::~BranchObj ()
 {
+//	cout << "Destr BranchObj of "<<this<<" ("<<treeItem->getHeading().toStdString()<<")"<<endl;
+
 	// If I'm animated, I need to un-animate myself first
 	if (anim.isAnimated() )
 	{
@@ -55,7 +57,6 @@
 		model->stopAnimation (this);
 	}
 
-	cout << "Destr BranchObj of "<<this<<" ("<<treeItem->getHeading().toStdString()<<")"<<endl;
 	// Check, if this branch was the last child to be deleted
 	// If so, unset the scrolled flags in parent // FIXME-2 better do this in model?
 
diff -r a8a5c7288f57 -r c6908bc17d78 linkablemapobj.cpp
--- a/linkablemapobj.cpp	Mon Apr 27 12:07:15 2009 +0000
+++ b/linkablemapobj.cpp	Mon Apr 27 12:42:06 2009 +0000
@@ -564,39 +564,6 @@
     return parObj;
 }
 
-LinkableMapObj* LinkableMapObj::findObjBySelect (QString s)	// FIXME-0 already in VM???
-{
-	LinkableMapObj *lmo=this;
-	QString part;
-	QString typ;
-	QString num;
-	while (!s.isEmpty() )
-	{
-		part=s.section(",",0,0);
-		typ=part.left (3);
-		num=part.right(part.length() - 3);
-		if (typ=="mc:")
-		{
-			if (treeItem->depth()>0)
-				return false;	// in a subtree there is no center
-			else
-				break;
-		} else
-			if (typ=="bo:")
-				lmo=lmo->getTreeItem()->getBranchObjNum (num.toInt());
-			else
-				if (typ=="fi:")
-					lmo=((BranchObj*)lmo)->getFloatImageNum (num.toUInt());
-		if (!lmo) break;
-		
-		if (s.contains(","))
-			s=s.right(s.length() - part.length() -1 );
-		else	
-			break;
-	}
-	return lmo;
-}
-
 QPointF LinkableMapObj::getChildPos()
 {
     return childPos;
diff -r a8a5c7288f57 -r c6908bc17d78 linkablemapobj.h
--- a/linkablemapobj.h	Mon Apr 27 12:07:15 2009 +0000
+++ b/linkablemapobj.h	Mon Apr 27 12:42:06 2009 +0000
@@ -96,7 +96,6 @@
 											// redraw link with given style
     LinkableMapObj* getChildObj();			// returns pointer to fromObj
     LinkableMapObj* getParObj();			// returns pointer to toObj
-    virtual LinkableMapObj* findObjBySelect(QString s);	// find obj by selectstring
 	virtual void setDockPos()=0;				// sets childPos and parPos
     QPointF getChildPos();					// returns pos where children dock
     QPointF getParPos();						// returns pos where parents dock
diff -r a8a5c7288f57 -r c6908bc17d78 mainwindow.cpp
--- a/mainwindow.cpp	Mon Apr 27 12:07:15 2009 +0000
+++ b/mainwindow.cpp	Mon Apr 27 12:42:06 2009 +0000
@@ -3070,10 +3070,11 @@
 void Main::editUpperBranch()
 {
 	VymModel *m=currentModel();
-	if (m) m->selectUpperBranch();	// FIXME-0 check also lower... this probably should go into view...
+	if (m) m->selectUpperBranch();	// FIXME-3 check also lower... this probably should go into view...
 }
 
-void Main::editLowerBranch()
+void Main::editLowerBranch()	// FIXME-3 check also lower... this probably should go into view...
+
 {
 	VymModel *m=currentModel();
 	if (m) m->selectLowerBranch();
diff -r a8a5c7288f57 -r c6908bc17d78 selection.cpp
--- a/selection.cpp	Mon Apr 27 12:07:15 2009 +0000
+++ b/selection.cpp	Mon Apr 27 12:42:06 2009 +0000
@@ -42,7 +42,8 @@
 	}	
 */
 }
-bool Selection::select(LinkableMapObj *lmo)	// TODO no multiselections yet
+bool Selection::select(LinkableMapObj *lmo)// FIXME-2 VM emit signal in VM instead and get rid of this
+
 {
 	return model->select (lmo);
 	/*
@@ -56,7 +57,8 @@
 	*/
 }
 
-bool Selection::select (const QString &s)	// TODO no multiselections yet
+bool Selection::select (const QString &s)// FIXME-2 VM emit signal in VM instead and get rid of this
+
 {
 	return model->select (s);
 	/*
diff -r a8a5c7288f57 -r c6908bc17d78 treeitem.cpp
--- a/treeitem.cpp	Mon Apr 27 12:07:15 2009 +0000
+++ b/treeitem.cpp	Mon Apr 27 12:42:06 2009 +0000
@@ -111,7 +111,6 @@
 		qWarning ("TreeItem::removeChild tried to remove non existing item?!\n");
 	else
 	{
-		cout << "TI::removeChild this="<<this<<"  row="<<row<<endl;
 		if (childItems.at(row)->isBranchLikeType())
 			branchCounter--;
 		childItems.removeAt (row);
diff -r a8a5c7288f57 -r c6908bc17d78 treemodel.cpp
--- a/treemodel.cpp	Mon Apr 27 12:07:15 2009 +0000
+++ b/treemodel.cpp	Mon Apr 27 12:42:06 2009 +0000
@@ -181,15 +181,12 @@
 bool TreeModel::removeRows ( int row, int count, const QModelIndex & parent)
 {
 	int last=row+count-1;
-	cout << "TreeModel::removeRows row="<<row<<"  count="<<count<<"  last="<<last<<endl;
     TreeItem *pi= getItem (parent);
 	TreeItem *ti;
-	cout << "  pi="<<pi<<"  "<<pi->getHeading().toStdString()<<endl;
 	beginRemoveRows (parent,row,last);
 
 	for (int i=row; i<=last; i++)
 	{
-		cout << "TreeModel::removeRows removing i="<<i<<std::endl;
 		ti=pi->getChildNum (row);
 		pi->removeChild (row);	// does not delete object!
 		switch (ti->getType()) 
diff -r a8a5c7288f57 -r c6908bc17d78 vymmodel.cpp
--- a/vymmodel.cpp	Mon Apr 27 12:07:15 2009 +0000
+++ b/vymmodel.cpp	Mon Apr 27 12:42:06 2009 +0000
@@ -273,7 +273,7 @@
 {
     QString s;
 
-	for (int i=0; i<rootItem->branchCount(); i++)	// FIXME-0 remove mapCenters
+	for (int i=0; i<rootItem->branchCount(); i++)
 		s+=((MapCenterItem*)rootItem->getBranchNum(i))->saveToDir (tmpdir,prefix,offset);
     return s;
 }
@@ -985,10 +985,7 @@
 void VymModel::setChanged()
 {
 	if (!mapChanged)
-	{
 		autosaveTimer->start(settings.value("/mainwindow/autosave/ms/",300000).toInt());
-		cout <<"   timer started with "<<settings.value("/mainwindow/autosave/ms/",300000).toInt()<<endl;
-	}	
 	mapChanged=true;
 	mapDefault=false;
 	mapUnsaved=true;
@@ -2255,7 +2252,6 @@
 
 BranchItem* VymModel::relinkBranch (BranchItem *branch, BranchItem *dst, int pos)
 {
-	cout << "VM::relinkBranch  "<<branch->getHeadingStd()<<"  to "<<dst->getHeadingStd()<<"  at pos="<<pos<<endl;
 	if (branch && dst)
 	{
 		emit (layoutAboutToBeChanged() );
@@ -2273,7 +2269,6 @@
 			n=0;
 		else	
 			n=dst->getFirstBranch()->childNumber(); 
-	cout << "***  dst->bCount="<<dst->branchCount()<<"  n="<<n<<"  pos="<<pos<<endl;		
 		beginInsertRows (index(dst),n+pos,n+pos);
 		dst->insertBranch (pos,branch);
 		endInsertRows();
@@ -2339,7 +2334,6 @@
 
 		emit (layoutAboutToBeChanged() );
 
-		cout << "VM::delete  selbi="<<selbi<<"  row="<<ix.row()<<endl;
 		parentIndex=parent(index(selbi));
 		int n=ix.row();
 		beginRemoveRows (parentIndex,n,n);