1.1 --- a/treeitem.cpp	Mon Mar 23 09:06:51 2009 +0000
     1.2 +++ b/treeitem.cpp	Thu Mar 26 07:49:17 2009 +0000
     1.3 @@ -1,10 +1,16 @@
     1.4 +#include <iostream>
     1.5 +using namespace std;
     1.6 +
     1.7  #include <QStringList>
     1.8  
     1.9  #include "branchobj.h"
    1.10  #include "treeitem.h"
    1.11 +#include "vymmodel.h"
    1.12  
    1.13  TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent)
    1.14  {
    1.15 +	model=NULL;
    1.16 +
    1.17      parentItem = parent;
    1.18      itemData = data;
    1.19  	lmo=NULL;
    1.20 @@ -12,6 +18,12 @@
    1.21  	branchOffset=0;
    1.22  	branchCounter=0;
    1.23  	lastSelectedBranchNum=-1;
    1.24 +
    1.25 +	note.setNote(""); 
    1.26 +	// note.setFontHint (textEditor->getFontHintDefault() );	//FIXME-2
    1.27 +	// isNoteInEditor=false;
    1.28 +
    1.29 +
    1.30  }
    1.31  
    1.32  TreeItem::~TreeItem()
    1.33 @@ -19,10 +31,36 @@
    1.34      qDeleteAll(childItems);
    1.35  }
    1.36  
    1.37 +QString TreeItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
    1.38 +{
    1.39 +	qWarning ("TreeItem::saveToDir called directly");
    1.40 +	return QString();
    1.41 +}
    1.42 +
    1.43 +
    1.44 +/*
    1.45 +void TreeItem::copy (OrnamentedObj* other)	//FIXME-2
    1.46 +
    1.47 +{
    1.48 +	note.copy (other->note);
    1.49 +	model=other->model;
    1.50 +}
    1.51 +*/
    1.52 +
    1.53 +void TreeItem::setModel (VymModel *m)
    1.54 +{
    1.55 +	model=m;
    1.56 +}
    1.57 +
    1.58 +VymModel* TreeItem::getModel ()
    1.59 +{
    1.60 +	return model;
    1.61 +}
    1.62  
    1.63  void TreeItem::appendChild(TreeItem *item)
    1.64  {
    1.65      childItems.append(item);
    1.66 +	item->setModel (model);
    1.67  
    1.68  	if (item->type == Branch || item->type ==MapCenter)
    1.69  	{
    1.70 @@ -32,8 +70,6 @@
    1.71  	}
    1.72  }
    1.73  
    1.74 -#include <iostream>
    1.75 -using namespace std;
    1.76  void TreeItem::removeChild(int row)
    1.77  {
    1.78      if (row<0 || row > childItems.size()-1)
    1.79 @@ -109,7 +145,7 @@
    1.80  		case Undefined: return -1;
    1.81  		case MapCenter: return parentItem->childItems.indexOf (this) - branchOffset;
    1.82  		case Branch: return parentItem->childItems.indexOf (this) - branchOffset;
    1.83 -		case Image: return -1; // FIXME
    1.84 +		case Image: return -1; // FIXME-2
    1.85  		default: return -1;
    1.86  	}
    1.87  	
    1.88 @@ -132,26 +168,43 @@
    1.89  
    1.90  void TreeItem::setNote(const QString s)
    1.91  {
    1.92 -	switch (type)
    1.93 -	{
    1.94 -		case MapCenter: 
    1.95 -			((BranchObj*)lmo)->setNote(s);
    1.96 -			break;
    1.97 -		case Branch: 
    1.98 -			((BranchObj*)lmo)->setNote(s);
    1.99 -			break;
   1.100 -		default: ;
   1.101 -	}
   1.102 +	note.setNote(s);
   1.103 +	// updateNoteFlag();  FIXME-2 needed?
   1.104 +	if (model) 
   1.105 +		model->emitContentHasChanged (this);
   1.106 +}
   1.107 +
   1.108 +void TreeItem::setNoteObj(const NoteObj &n, bool updateNoteEditor)
   1.109 +{
   1.110 +	note=n;
   1.111 +	// updateNoteFlag();  FIXME-2 needed?
   1.112 +	if (model && updateNoteEditor)	
   1.113 +		model->emitContentHasChanged (this);
   1.114  }
   1.115  
   1.116  QString TreeItem::getNote()
   1.117  {
   1.118 -	switch (type)
   1.119 -	{
   1.120 -		case MapCenter: return ((BranchObj*)lmo)->getNote();
   1.121 -		case Branch: return ((BranchObj*)lmo)->getNote();
   1.122 -		default: return QString ();
   1.123 -	}
   1.124 +	return note.getNote();
   1.125 +}
   1.126 +
   1.127 +NoteObj TreeItem::getNoteObj()
   1.128 +{
   1.129 +	return note;
   1.130 +}
   1.131 +
   1.132 +QString TreeItem::getNoteASCII(const QString &indent, const int &width)
   1.133 +{
   1.134 +    return note.getNoteASCII(indent,width);
   1.135 +}
   1.136 +
   1.137 +QString TreeItem::getNoteASCII()
   1.138 +{
   1.139 +    return note.getNoteASCII();
   1.140 +}
   1.141 +
   1.142 +QString TreeItem::getNoteOpenDoc()
   1.143 +{
   1.144 +    return note.getNoteOpenDoc();
   1.145  }
   1.146  
   1.147  void TreeItem::setType(const Type t)
   1.148 @@ -221,7 +274,7 @@
   1.149  	return getBranchNum (lastSelectedBranchNum);
   1.150  }
   1.151  
   1.152 -LinkableMapObj* TreeItem::getLMO()	// FIXME VM should be unnecessary in the end
   1.153 +LinkableMapObj* TreeItem::getLMO()	// FIXME-3  VM should be unnecessary in the end
   1.154  {
   1.155  	return lmo;
   1.156  }