1.1 --- a/mapcenteritem.cpp Tue Apr 28 20:53:44 2009 +0000
1.2 +++ b/mapcenteritem.cpp Wed Apr 29 18:46:31 2009 +0000
1.3 @@ -6,8 +6,7 @@
1.4
1.5 MapCenterItem::MapCenterItem(const QList<QVariant> &data, TreeItem *parent):BranchItem (data,parent)
1.6 {
1.7 - scrolled=false;
1.8 - tmpUnscrolled=false;
1.9 + type=MapCenter;
1.10 }
1.11
1.12 MapCenterItem::~MapCenterItem()
1.13 @@ -16,15 +15,17 @@
1.14 qDeleteAll(childItems);
1.15 }
1.16
1.17 -QString MapCenterItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
1.18 +QString MapCenterItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset) //FIXME-1
1.19 {
1.20 + cout << "MCI::saveToDir: "<<getHeadingStd()<<endl;
1.21 +
1.22 // Cloudy stuff can be hidden during exports
1.23 if (hidden) return QString();
1.24
1.25 QString s,a;
1.26 BranchObj *bo=(BranchObj*)lmo;
1.27
1.28 - /* FIXME-1
1.29 + /*
1.30 // Update of note is usually done while unselecting a branch
1.31 if (isNoteInEditor) getNoteFromTextEditor();
1.32
1.33 @@ -55,7 +56,7 @@
1.34 idAttr="";
1.35
1.36 */
1.37 - s=beginElement ("branch"
1.38 + s=beginElement ("mapcenter"
1.39 // +getOrnXMLAttr()
1.40 // +scrolledAttr
1.41 // +areaAttr
1.42 @@ -86,10 +87,15 @@
1.43 s+=note.saveToDir();
1.44
1.45 // Save branches
1.46 - TreeItem *ti=getFirstBranch();
1.47 - TreeItem *last=getLastBranch();
1.48 - while (ti && ti!=last)
1.49 - s+=ti->saveToDir(tmpdir,prefix,offset);
1.50 + int i=0;
1.51 + TreeItem *ti=getBranchNum(i);
1.52 + while (ti)
1.53 + {
1.54 + s+=getBranchNum(i)->saveToDir(tmpdir,prefix,offset);
1.55 + i++;
1.56 + ti=getBranchNum(i);
1.57 + }
1.58 +
1.59
1.60 /*
1.61 // Save XLinks
1.62 @@ -110,9 +116,32 @@
1.63 */
1.64
1.65 decIndent();
1.66 - s+=endElement ("branch");
1.67 + s+=endElement ("mapcenter");
1.68 return s;
1.69 }
1.70
1.71 +BranchObj* MapCenterItem::createMapObj(QGraphicsScene *scene)
1.72 +{
1.73 + cout <<"MCI parent->model="<<parent()->getModel()<<endl;
1.74 + // Initialize MapCenterObj, order of things is important...
1.75 + MapCenterObj* mco=new MapCenterObj(scene);
1.76 + lmo=mco;
1.77 + mco->setParObj(NULL);
1.78 + mco->setModel (model);
1.79 + mco->setTreeItem (this);
1.80 + mco->setDefAttr(BranchObj::NewBranch);
1.81
1.82 + initLMO();
1.83
1.84 + if (!getHeading().isEmpty() )
1.85 + {
1.86 + mco->updateHeading();
1.87 + mco->setColor (headingColor);
1.88 + }
1.89 +
1.90 + //mco->updateLink(); //FIXME-3
1.91 +
1.92 + return mco;
1.93 +}
1.94 +
1.95 +