1.1 --- a/floatimageobj.cpp Wed Jun 03 20:37:17 2009 +0000
1.2 +++ b/floatimageobj.cpp Mon Jun 08 11:36:56 2009 +0000
1.3 @@ -8,9 +8,6 @@
1.4 // FloatImageObj
1.5 /////////////////////////////////////////////////////////////////
1.6
1.7 -uint FloatImageObj::saveCounter=0; // make instance
1.8 -
1.9 -
1.10 FloatImageObj::FloatImageObj ():FloatObj()
1.11 {
1.12 // cout << "Const FloatImageObj ()\n";
1.13 @@ -20,7 +17,7 @@
1.14
1.15 FloatImageObj::FloatImageObj (QGraphicsScene* s):FloatObj(s)
1.16 {
1.17 - // cout << "Const FloatImageObj (s) called from MapCenterObj (s)\n";
1.18 +// cout << "Const FloatImageObj (s) called from MapCenterObj (s)\n";
1.19 setParObj (this);
1.20 init();
1.21 }
1.22 @@ -155,58 +152,6 @@
1.23 // TODO
1.24 }
1.25
1.26 -QString FloatImageObj::saveToDir (const QString &tmpdir,const QString &prefix)
1.27 -{
1.28 - //FIXME-2 if (hidden) return "";
1.29 -
1.30 - saveCounter++;
1.31 -
1.32 - QString useOrientAttr;
1.33 - if (useOrientation)
1.34 - useOrientAttr=attribut ("useOrientation","true");
1.35 - else
1.36 - useOrientAttr=attribut ("useOrientation","false");
1.37 -
1.38 - QString saveInMapAttr;
1.39 - if (saveInMap)
1.40 - saveInMapAttr=attribut ("saveInMap","true");
1.41 - else
1.42 -
1.43 - saveInMapAttr=attribut ("saveInMap","false");
1.44 -
1.45 - QString exportAttr;
1.46 - if (floatExport)
1.47 - exportAttr=attribut ("floatExport","true");
1.48 - else
1.49 - exportAttr=attribut ("floatExport","false");
1.50 -
1.51 - QString zAttr=attribut ("zPlane",QString().setNum(zPlane));
1.52 - QString url;
1.53 -
1.54 - url="images/"+prefix+"image-" + QString().number(saveCounter,10) + ".png" ;
1.55 -
1.56 - // And really save the image
1.57 - icon->save (tmpdir +"/"+ url, "PNG");
1.58 -
1.59 - QString nameAttr=attribut ("orgName",originalFilename);
1.60 -
1.61 - return singleElement ("floatimage",
1.62 - getOrnXMLAttr()
1.63 - +useOrientAttr
1.64 - +saveInMapAttr
1.65 - +exportAttr
1.66 - +zAttr
1.67 - +attribut ("href",QString ("file:")+url)
1.68 - +nameAttr
1.69 - );
1.70 -}
1.71 -
1.72 -void FloatImageObj::resetSaveCounter()
1.73 -{
1.74 - saveCounter=0;
1.75 -}
1.76 -
1.77 -
1.78 QRectF FloatImageObj::getTotalBBox()
1.79 {
1.80 return bbox;