1.1 --- a/treeitem.cpp	Sat Aug 08 21:58:26 2009 +0000
     1.2 +++ b/treeitem.cpp	Tue Aug 18 12:39:07 2009 +0000
     1.3 @@ -13,7 +13,7 @@
     1.4  
     1.5  TreeItem::TreeItem()
     1.6  {
     1.7 -	//cout << "Constr. TI\n";
     1.8 +	//cout << "Constr. TI  this="<<this<<endl;
     1.9  	init();
    1.10  	itemData.clear();
    1.11  	rootItem=this;
    1.12 @@ -47,6 +47,12 @@
    1.13  			case TreeItem::Branch:
    1.14  				delete (BranchItem*)ti;
    1.15  				break;
    1.16 +			case TreeItem::Image:
    1.17 +				delete (ImageItem*)ti;
    1.18 +				break;
    1.19 +			case TreeItem::Attribute:
    1.20 +				delete (AttributeItem*)ti;
    1.21 +				break;
    1.22  			default:
    1.23  				delete ti;
    1.24  				break;
    1.25 @@ -59,12 +65,6 @@
    1.26  {
    1.27  	model=NULL;
    1.28  
    1.29 -    parentItem = NULL;
    1.30 -    itemData.clear();
    1.31 -	QList<QVariant> cData;
    1.32 -	itemData<< "VM:addMapCenter" << "undef"<<"undef";
    1.33 -
    1.34 -
    1.35  	branchOffset=0;
    1.36  	branchCounter=0;
    1.37  
    1.38 @@ -148,6 +148,12 @@
    1.39  		// branches are on bottom of list
    1.40  		childItems.append(item);
    1.41  		branchCounter++;
    1.42 +
    1.43 +		// Set correct type		//FIXME-3 DUP in constr branchitem
    1.44 +		if (this==rootItem)
    1.45 +			item->setType(MapCenter);
    1.46 +		else
    1.47 +			item->setType (Branch);
    1.48  	}
    1.49  }
    1.50  
    1.51 @@ -175,14 +181,17 @@
    1.52  	}
    1.53  }
    1.54  
    1.55 -void TreeItem::removeChildBranches()
    1.56 +/*
    1.57 +void TreeItem::clear()	// FIXME-2 used in vymmodel addMapInsert, but needs to be used via model and emit layout changes...
    1.58  {
    1.59 +	cout << "TI::clear\n";
    1.60  	while ( childItems.size()>0)
    1.61  	{
    1.62  		branchCounter--;
    1.63  		childItems.removeAt (0);
    1.64  	}
    1.65  }
    1.66 +*/
    1.67  
    1.68  TreeItem *TreeItem::child(int row)
    1.69  {
    1.70 @@ -233,6 +242,7 @@
    1.71      if (parentItem)
    1.72          return parentItem->childItems.indexOf(const_cast<TreeItem*>(this));
    1.73  
    1.74 +	cout << "TI::row() pI=NULL this="<<this<<"  ***************\n";
    1.75      return 0;
    1.76  }
    1.77  
    1.78 @@ -298,7 +308,7 @@
    1.79  
    1.80  TreeItem::Type TreeItem::getType()
    1.81  {
    1.82 -	if (type==Branch && depth()==0) return MapCenter;
    1.83 +	if (type==Branch && depth()==0) return MapCenter;	//FIXME-2 should not be necesssary
    1.84  	return type;
    1.85  }
    1.86  
    1.87 @@ -316,6 +326,7 @@
    1.88  		case MapCenter: return QString ("MapCenter");
    1.89  		case Branch: return QString ("Branch");
    1.90  		case Image: return QString ("Image");
    1.91 +		case Attribute: return QString ("Attribute");
    1.92  		default: return QString ("TreeItem::getTypeName no typename defined?!");
    1.93  	}
    1.94  }