diff -r 6e4b586aa88a -r 25e634a7e1dc floatimageobj.cpp --- a/floatimageobj.cpp Wed Jun 03 20:37:17 2009 +0000 +++ b/floatimageobj.cpp Mon Jun 08 11:36:56 2009 +0000 @@ -8,9 +8,6 @@ // FloatImageObj ///////////////////////////////////////////////////////////////// -uint FloatImageObj::saveCounter=0; // make instance - - FloatImageObj::FloatImageObj ():FloatObj() { // cout << "Const FloatImageObj ()\n"; @@ -20,7 +17,7 @@ FloatImageObj::FloatImageObj (QGraphicsScene* s):FloatObj(s) { - // cout << "Const FloatImageObj (s) called from MapCenterObj (s)\n"; +// cout << "Const FloatImageObj (s) called from MapCenterObj (s)\n"; setParObj (this); init(); } @@ -155,58 +152,6 @@ // TODO } -QString FloatImageObj::saveToDir (const QString &tmpdir,const QString &prefix) -{ - //FIXME-2 if (hidden) return ""; - - saveCounter++; - - QString useOrientAttr; - if (useOrientation) - useOrientAttr=attribut ("useOrientation","true"); - else - useOrientAttr=attribut ("useOrientation","false"); - - QString saveInMapAttr; - if (saveInMap) - saveInMapAttr=attribut ("saveInMap","true"); - else - - saveInMapAttr=attribut ("saveInMap","false"); - - QString exportAttr; - if (floatExport) - exportAttr=attribut ("floatExport","true"); - else - exportAttr=attribut ("floatExport","false"); - - QString zAttr=attribut ("zPlane",QString().setNum(zPlane)); - QString url; - - url="images/"+prefix+"image-" + QString().number(saveCounter,10) + ".png" ; - - // And really save the image - icon->save (tmpdir +"/"+ url, "PNG"); - - QString nameAttr=attribut ("orgName",originalFilename); - - return singleElement ("floatimage", - getOrnXMLAttr() - +useOrientAttr - +saveInMapAttr - +exportAttr - +zAttr - +attribut ("href",QString ("file:")+url) - +nameAttr - ); -} - -void FloatImageObj::resetSaveCounter() -{ - saveCounter=0; -} - - QRectF FloatImageObj::getTotalBBox() { return bbox;