1.1 --- a/treeitem.cpp Thu Apr 30 11:52:49 2009 +0000
1.2 +++ b/treeitem.cpp Fri May 01 10:30:29 2009 +0000
1.3 @@ -52,6 +52,9 @@
1.4 branchCounter=0;
1.5 lastSelectedBranchNum=-1;
1.6
1.7 + imageOffset=0;
1.8 + imageCounter=0;
1.9 +
1.10 note.setNote("");
1.11 // note.setFontHint (textEditor->getFontHintDefault() ); //FIXME-2
1.12 // isNoteInEditor=false;
1.13 @@ -198,7 +201,7 @@
1.14 case Undefined: return -1;
1.15 case MapCenter: return parentItem->childItems.indexOf (this) - branchOffset;
1.16 case Branch: return parentItem->childItems.indexOf (this) - branchOffset;
1.17 - case Image: return -1; // FIXME-2
1.18 + case Image: return parentItem->childItems.indexOf (this) - imageOffset;
1.19 default: return -1;
1.20 }
1.21 }
1.22 @@ -209,9 +212,9 @@
1.23 switch (item->getType())
1.24 {
1.25 case Undefined: return -1;
1.26 - case MapCenter: return childItems.indexOf (this) - branchOffset;
1.27 - case Branch: return childItems.indexOf (this) - branchOffset;
1.28 - case Image: return -1; // FIXME-2
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 default: return -1;
1.33 }
1.34 }
1.35 @@ -351,6 +354,16 @@
1.36 return NULL;
1.37 }
1.38
1.39 +BranchItem* TreeItem::getNextBranch(BranchItem *currentBranch)
1.40 +{
1.41 + if (!currentBranch) return NULL;
1.42 + int n=num (currentBranch)+1;
1.43 + if (n<branchCounter)
1.44 + return getBranchNum (branchOffset + n);
1.45 + else
1.46 + return NULL;
1.47 +}
1.48 +
1.49
1.50 BranchItem* TreeItem::getBranchNum(const int &n)
1.51 {