1.1 --- a/mapcenterobj.cpp	Thu Sep 22 12:56:05 2005 +0000
     1.2 +++ b/mapcenterobj.cpp	Mon Oct 10 11:20:25 2005 +0000
     1.3 @@ -33,7 +33,6 @@
     1.4  {
     1.5  	BranchObj::init();
     1.6      orientation=OrientUndef;
     1.7 -    absPos=QPoint (canvas->width()/2, canvas->height()/2);
     1.8  
     1.9  	// FIXME this should be done in TextObj later...
    1.10  	//QFont font ("Sans Serif,16,-1,5,50,0,0,0,0,0");		
    1.11 @@ -41,9 +40,7 @@
    1.12  	depth=0;
    1.13  	setDefAttr(MovedBranch);
    1.14  
    1.15 -
    1.16  	frame->setFrameType (Rectangle);
    1.17 -	move (absPos.x(), absPos.y() );
    1.18  }
    1.19  
    1.20  void MapCenterObj::move (double x, double y)
    1.21 @@ -54,7 +51,8 @@
    1.22  
    1.23  void MapCenterObj::moveBy (double x, double y)
    1.24  {
    1.25 -	BranchObj::moveBy(x,y);
    1.26 +	//BranchObj::moveBy(x,y);
    1.27 +	move (x+absPos.x(),y+absPos.y() );
    1.28  	positionBBox();
    1.29  }
    1.30  
    1.31 @@ -144,9 +142,6 @@
    1.32  	s+=standardFlags->saveToDir(tmpdir+"/flags", "/standardFlag-", verbose);
    1.33      s=s+valueElement("heading", getHeading(),a);
    1.34  
    1.35 -	// Reset the counters before saving
    1.36 -	FloatImageObj (canvas).resetSaveCounter();
    1.37 -
    1.38  	// add link to file in s
    1.39  	if (!note.isEmpty() )
    1.40  		s+=note.saveToDir();
    1.41 @@ -159,7 +154,7 @@
    1.42  	// Save FloatImages
    1.43  	FloatImageObj *fio;
    1.44  	for (fio=floatimage.first(); fio; fio=floatimage.next() )
    1.45 -		s+=fio->saveToDir (tmpdir,prefix);
    1.46 +		s+=fio->saveToDir (tmpdir,prefix,offset);
    1.47  
    1.48  	// Save XLinks
    1.49  	XLinkObj *xlo;