1.11.7: Fixed hanging find function
authorinsilmaril
Tue, 08 Apr 2008 08:28:37 +0000
changeset 6814e558a15a804
parent 680 8c6faaa1e2b1
child 682 16af22e2c155
1.11.7: Fixed hanging find function
mapcenterobj.cpp
mapcenterobj.h
     1.1 --- a/mapcenterobj.cpp	Tue Mar 25 11:16:39 2008 +0000
     1.2 +++ b/mapcenterobj.cpp	Tue Apr 08 08:28:37 2008 +0000
     1.3 @@ -3,6 +3,8 @@
     1.4  #include "floatimageobj.h"
     1.5  #include "geometry.h"
     1.6  #include "mapcenterobj.h"
     1.7 +#include "mapeditor.h"
     1.8 +
     1.9  
    1.10  /////////////////////////////////////////////////////////////////
    1.11  // MapCenterObj
    1.12 @@ -49,6 +51,11 @@
    1.13  	BranchObj::move(x,y);
    1.14  }
    1.15  
    1.16 +void MapCenterObj::move (QPointF absPos)
    1.17 +{
    1.18 +	BranchObj::move(absPos);
    1.19 +}
    1.20 +
    1.21  void MapCenterObj::moveBy (double x, double y)
    1.22  {
    1.23  	BranchObj::moveBy(x,y);
    1.24 @@ -132,7 +139,8 @@
    1.25  	// Providing an ID for a branch makes export to XHTML easier
    1.26  	QString idAttr;
    1.27  	if (countXLinks()>0)
    1.28 -		idAttr=attribut ("id",getSelectString());
    1.29 +		idAttr=attribut ("id",mapEditor->getModel()->getSelectString(this)); //TODO directly access model
    1.30 +
    1.31  	else
    1.32  		idAttr="";
    1.33  
     2.1 --- a/mapcenterobj.h	Tue Mar 25 11:16:39 2008 +0000
     2.2 +++ b/mapcenterobj.h	Tue Apr 08 08:28:37 2008 +0000
     2.3 @@ -17,6 +17,7 @@
     2.4      void clear();
     2.5      void init();
     2.6      virtual void move      (double,double);
     2.7 +    virtual void move      (QPointF absPos);
     2.8      virtual void moveBy    (double,double);
     2.9      virtual void moveAll   (double,double);
    2.10      virtual void moveAllBy (double,double);