diff -r 6269016c9905 -r c6bb4fdcc55f treeitem.cpp --- a/treeitem.cpp Thu Aug 06 10:42:17 2009 +0000 +++ b/treeitem.cpp Sat Aug 08 21:58:26 2009 +0000 @@ -67,7 +67,6 @@ branchOffset=0; branchCounter=0; - lastSelectedBranchNum=-1; imageOffset=0; imageCounter=0; @@ -244,6 +243,8 @@ int TreeItem::depth() { + // Rootitem d=-1 + // MapCenter d=0 int d=-2; TreeItem *ti=this; while (ti!=NULL) @@ -271,6 +272,7 @@ case MapCenter: return parentItem->childItems.indexOf (this) - parentItem->branchOffset; case Branch: return parentItem->childItems.indexOf (this) - parentItem->branchOffset; case Image: return parentItem->childItems.indexOf (this) - parentItem->imageOffset; + case Attribute: return parentItem->childItems.indexOf (this) - parentItem->attributeOffset; default: return -1; } } @@ -284,6 +286,7 @@ case MapCenter: return childItems.indexOf (item) - branchOffset; case Branch: return childItems.indexOf (item) - branchOffset; case Image: return parentItem->childItems.indexOf (item) - imageOffset; + case Attribute: return parentItem->childItems.indexOf (item) - attributeOffset; default: return -1; } } @@ -295,6 +298,7 @@ TreeItem::Type TreeItem::getType() { + if (type==Branch && depth()==0) return MapCenter; return type; } @@ -592,22 +596,6 @@ return NULL; } -void TreeItem::setLastSelectedBranch() -{ - if (parentItem) - parentItem->lastSelectedBranchNum=parentItem->childItems.indexOf(this); -} - -void TreeItem::setLastSelectedBranch(int i) -{ - lastSelectedBranchNum=i; -} - -TreeItem* TreeItem::getLastSelectedBranch() -{ - return getBranchNum (lastSelectedBranchNum); -} - ImageItem* TreeItem::getImageNum (const int &n) { if (n>=0 && n