diff -r 25a77484ec72 -r db0ec4bcf416 branchitem.cpp --- a/branchitem.cpp Tue Apr 07 16:15:53 2009 +0000 +++ b/branchitem.cpp Mon Apr 20 10:42:05 2009 +0000 @@ -249,6 +249,59 @@ } } +TreeItem* BranchItem::findMapItem (QPointF p, TreeItem* excludeLMO) +{ + // Search branches + TreeItem *ti; + for (int i=0; ifindMapItem(p, excludeLMO); + if (ti != NULL) return ti; + } + + + // Search myself + if (getBranchObj()->isInClickBox (p) && (this != excludeLMO) && getBranchObj()->isVisibleObj() ) + return this; + +/* FIXME-2 // Search float images + for (int i=0; iisInClickBox(p) && + (floatimage.at(i) != excludeLMO) && + floatimage.at(i)->getParObj()!= excludeLMO && + floatimage.at(i)->isVisibleObj() + ) return floatimage.at(i)->getTreeItem(); +*/ + return NULL; +} + +TreeItem* BranchItem::findID (QString sid) +{ + // Search branches + TreeItem *ti; + for (int i=0; ifindID (sid); + if (ti != NULL) return ti; + } + + // Search myself + if (sid==objID) return this; + + +/* + // Search float images + for (int i=0; iinBox(p) && + (floatimage.at(i) != excludeLMO) && + floatimage.at(i)->getParObj()!= excludeLMO && + floatimage.at(i)->isVisibleObj() + ) return floatimage.at(i); +*/ + return NULL; +} + + BranchObj* BranchItem::getBranchObj() // FIXME-3 only for transition BO->BI { return (BranchObj*)lmo;