1.1 --- a/treeitem.cpp	Thu Aug 06 10:42:17 2009 +0000
     1.2 +++ b/treeitem.cpp	Sat Aug 08 21:58:26 2009 +0000
     1.3 @@ -67,7 +67,6 @@
     1.4  
     1.5  	branchOffset=0;
     1.6  	branchCounter=0;
     1.7 -	lastSelectedBranchNum=-1;
     1.8  
     1.9  	imageOffset=0;
    1.10  	imageCounter=0;
    1.11 @@ -244,6 +243,8 @@
    1.12  
    1.13  int TreeItem::depth() 
    1.14  {
    1.15 +	// Rootitem d=-1
    1.16 +	// MapCenter d=0
    1.17  	int d=-2;
    1.18  	TreeItem *ti=this;
    1.19  	while (ti!=NULL)
    1.20 @@ -271,6 +272,7 @@
    1.21  		case MapCenter: return parentItem->childItems.indexOf (this) - parentItem->branchOffset;
    1.22  		case Branch: return parentItem->childItems.indexOf (this) - parentItem->branchOffset;
    1.23  		case Image: return parentItem->childItems.indexOf (this) - parentItem->imageOffset;
    1.24 +		case Attribute: return parentItem->childItems.indexOf (this) - parentItem->attributeOffset;
    1.25  		default: return -1;
    1.26  	}
    1.27  }
    1.28 @@ -284,6 +286,7 @@
    1.29  		case MapCenter: return childItems.indexOf (item) - branchOffset;
    1.30  		case Branch: return childItems.indexOf (item) - branchOffset;
    1.31  		case Image: return parentItem->childItems.indexOf (item) - imageOffset;
    1.32 +		case Attribute: return parentItem->childItems.indexOf (item) - attributeOffset;
    1.33  		default: return -1;
    1.34  	}
    1.35  }
    1.36 @@ -295,6 +298,7 @@
    1.37  
    1.38  TreeItem::Type TreeItem::getType()
    1.39  {
    1.40 +	if (type==Branch && depth()==0) return MapCenter;
    1.41  	return type;
    1.42  }
    1.43  
    1.44 @@ -592,22 +596,6 @@
    1.45  		return NULL;
    1.46  }
    1.47  
    1.48 -void TreeItem::setLastSelectedBranch()
    1.49 -{
    1.50 -	if (parentItem)
    1.51 -		parentItem->lastSelectedBranchNum=parentItem->childItems.indexOf(this);
    1.52 -}
    1.53 -
    1.54 -void TreeItem::setLastSelectedBranch(int i)
    1.55 -{
    1.56 -		lastSelectedBranchNum=i;
    1.57 -}
    1.58 -
    1.59 -TreeItem* TreeItem::getLastSelectedBranch()
    1.60 -{
    1.61 -	return getBranchNum (lastSelectedBranchNum);
    1.62 -}
    1.63 -
    1.64  ImageItem* TreeItem::getImageNum (const int &n)
    1.65  {
    1.66  	if (n>=0 && n<imageCounter)