1.1 --- a/mapeditor.cpp Mon Mar 23 09:06:51 2009 +0000
1.2 +++ b/mapeditor.cpp Thu Mar 26 07:49:17 2009 +0000
1.3 @@ -43,7 +43,7 @@
1.4 model=vm;
1.5 model->setScene (mapScene);
1.6 model->registerEditor(this);
1.7 -// model->addMapCenter(); // FIXME create this in MapEditor until BO and MCO are independent of scene
1.8 +// model->addMapCenter(); // FIXME-3 create this in MapEditor until BO and MCO are independent of scene
1.9 model->makeDefault(); // No changes in model so far
1.10
1.11 setScene (mapScene);
1.12 @@ -70,7 +70,7 @@
1.13
1.14 setAcceptDrops (true);
1.15
1.16 - //model->reposition(); //FIXME really still needed?
1.17 + //model->reposition(); //FIXME-3 really still needed?
1.18
1.19
1.20 // Action to embed LineEdit for heading in Scene
1.21 @@ -93,7 +93,7 @@
1.22 selectionColor =QColor (255,255,0);
1.23
1.24
1.25 - // Attributes //FIXME testing only...
1.26 + // Attributes //FIXME-2 testing only...
1.27 QString k;
1.28 AttributeDef *ad;
1.29 attrTable= new AttributeTable();
1.30 @@ -128,7 +128,7 @@
1.31
1.32 MapEditor::~MapEditor()
1.33 {
1.34 - cout <<"Destructor MapEditor for "<<model->getMapName().toStdString()<<endl;
1.35 + //cout <<"Destructor MapEditor for "<<model->getMapName().toStdString()<<endl;
1.36 // No need to remove tmp files:
1.37 // tmpMapDir is in tmpVymDir,
1.38 // so it gets removed automagically when vym closes
1.39 @@ -217,7 +217,7 @@
1.40 font.setPointSize(10);
1.41 pp.setFont (font);
1.42 QRectF footerBox(0,viewBottom,printer->width(),15);
1.43 - // FIXME fileName not any longer available here: pp.drawText ( footerBox,Qt::AlignLeft,"VYM - " +fileName);
1.44 + // FIXME-3 fileName not any longer available here: pp.drawText ( footerBox,Qt::AlignLeft,"VYM - " +fileName);
1.45 pp.drawText ( footerBox, Qt::AlignRight, QDate::currentDate().toString(Qt::TextDate));
1.46 }
1.47 mapScene->render (
1.48 @@ -414,21 +414,21 @@
1.49 if (model->getSelectedBranch() )
1.50 {
1.51 // Context Menu on branch or mapcenter
1.52 - //FIXME model->updateActions(); needed?
1.53 + //FIXME-3 model->updateActions(); needed?
1.54 branchContextMenu->popup(e->globalPos() );
1.55 } else
1.56 {
1.57 if (model->getSelectedFloatImage() )
1.58 {
1.59 // Context Menu on floatimage
1.60 - // model->updateActions(); FIXME needed?
1.61 + // model->updateActions(); FIXME-3 needed?
1.62 floatimageContextMenu->popup(e->globalPos() );
1.63 }
1.64 }
1.65 } else
1.66 { // No MapObj found, we are on the Canvas itself
1.67 // Context Menu on scene
1.68 - // model->updateActions(); FIXME needed?
1.69 + // model->updateActions(); FIXME-3 needed?
1.70
1.71 // Open context menu synchronously to position new mapcenter
1.72 model->setContextPos (p);
1.73 @@ -513,7 +513,7 @@
1.74 mainWindow->windowToggleNoteEditor();
1.75 else if (foname=="hideInExport")
1.76 model->toggleHideExport();
1.77 - // FIXME needed? xelection.update();
1.78 + // FIXME-3 needed? xelection.update();
1.79 return;
1.80 }
1.81 }
1.82 @@ -558,7 +558,7 @@
1.83 */
1.84 // Select the clicked object
1.85
1.86 - // FIXME VM better let "find" return an index instead of lmo...
1.87 + // FIXME-2 VM better let "find" return an index instead of lmo...
1.88 // Get index of clicked LMO
1.89 TreeItem *ti=lmo->getTreeItem();
1.90 /*
1.91 @@ -603,8 +603,8 @@
1.92 // a button in the toolbar)
1.93 if (e->button() == Qt::MidButton )
1.94 model->toggleScroll();
1.95 - // model->updateActions(); FIXME needed?
1.96 - // FIXME needed? xelection.update();
1.97 + // model->updateActions(); FIXME-3 needed?
1.98 + // FIXME-3 needed? xelection.update();
1.99 } else
1.100 { // No MapObj found, we are on the scene itself
1.101 // Left Button move Pos of sceneView
1.102 @@ -799,7 +799,7 @@
1.103 {
1.104 tmpXLink->setEnd ( ((BranchObj*)(dst)) );
1.105 tmpXLink->updateXLink();
1.106 - tmpXLink->activate(); //FIXME savestate missing
1.107 + tmpXLink->activate(); //FIXME-2 savestate missing
1.108 //model->saveStateComplete(QString("Activate xLink from %1 to %2").arg(model->getObjectName(tmpXLink->getBegin())).arg(model->getObjectName(tmpXLink->getEnd())) );
1.109 } else
1.110 {
1.111 @@ -947,13 +947,13 @@
1.112 model->reposition();
1.113 }
1.114 }
1.115 - model->updateSelection(); //FIXME needed? at least not after pos of selection has changed...
1.116 + model->updateSelection(); //FIXME-3 needed? at least not after pos of selection has changed...
1.117 // Finally resize scene, if needed
1.118 scene()->update();
1.119 movingObj=NULL;
1.120
1.121 // Just make sure, that actions are still ok,e.g. the move branch up/down buttons...
1.122 - // model->updateActions(); FIXME neeeded?
1.123 + // model->updateActions(); FIXME-3 neeeded?
1.124 } else
1.125 // maybe we moved View: set old cursor
1.126 setCursor (Qt::ArrowCursor);
1.127 @@ -1108,10 +1108,10 @@
1.128 }
1.129 }
1.130
1.131 -void MapEditor::updateCurrent (const QModelIndex &,const QModelIndex &) //FIXME not used?
1.132 +void MapEditor::updateCurrent (const QModelIndex &,const QModelIndex &) //FIXME-3 not used?
1.133 {
1.134
1.135 -/* FIXME testing
1.136 +/* testing
1.137
1.138 cout << "ME::updateCurrent\n";
1.139