1.1 --- a/floatobj.cpp	Mon Oct 30 12:39:37 2006 +0000
     1.2 +++ b/floatobj.cpp	Mon Mar 05 23:22:51 2007 +0000
     1.3 @@ -14,17 +14,17 @@
     1.4      depth=-1;
     1.5  }
     1.6  
     1.7 -FloatObj::FloatObj (Q3Canvas* c):OrnamentedObj(c)
     1.8 +FloatObj::FloatObj (QGraphicsScene* s):OrnamentedObj(s)
     1.9  {
    1.10 -//	cout << "Const FloatObj (c)  called from MapCenterObj (c)\n";
    1.11 +//	cout << "Const FloatObj (s)  called from MapCenterObj (s)\n";
    1.12      setParObj (this);	
    1.13      init();
    1.14      depth=-1;
    1.15  }
    1.16  
    1.17 -FloatObj::FloatObj (Q3Canvas* c, LinkableMapObj* p):OrnamentedObj (c)
    1.18 +FloatObj::FloatObj (QGraphicsScene* s, LinkableMapObj* p):OrnamentedObj (s)
    1.19  {
    1.20 -//    cout << "Const FloatObj (c,p)\n";
    1.21 +//    cout << "Const FloatObj (s,p)\n";
    1.22      setParObj (p);	
    1.23      depth=p->getDepth()+1;
    1.24      init();
    1.25 @@ -50,12 +50,12 @@
    1.26  	setVisibility (other->visible);
    1.27  }
    1.28  
    1.29 -void FloatObj::setZ(const int &i)
    1.30 +void FloatObj::setZValue(const int &i)
    1.31  {
    1.32  	zPlane=i;
    1.33  }
    1.34  
    1.35 -int FloatObj::z()
    1.36 +int FloatObj::zValue()
    1.37  {
    1.38  	return zPlane;
    1.39  }
    1.40 @@ -73,12 +73,14 @@
    1.41  void FloatObj::move (double x, double y)
    1.42  {
    1.43  	MapObj::move(x,y);
    1.44 -	selbox->move(x,y);
    1.45 +	//selbox->setPos(x,y);
    1.46 +	selbox->rect().moveTo (QPointF (x,y));
    1.47  }
    1.48  
    1.49 -void FloatObj::move (QPoint p)
    1.50 +void FloatObj::move (QPointF p)
    1.51  {
    1.52 -	move (p.x(), p.y());
    1.53 +	MapObj::move (p);
    1.54 +	selbox->rect().moveTo (p);
    1.55  }
    1.56  
    1.57  void FloatObj::setDockPos()
    1.58 @@ -93,12 +95,12 @@
    1.59  	updateLink();	
    1.60  }
    1.61  
    1.62 -QRect FloatObj::getTotalBBox()
    1.63 +QRectF FloatObj::getTotalBBox()
    1.64  {
    1.65  	return bbox;
    1.66  }
    1.67  
    1.68 -QRect FloatObj::getBBoxSizeWithChilds()
    1.69 +QRectF FloatObj::getBBoxSizeWithChilds()
    1.70  {
    1.71  	return bboxTotal;
    1.72  }