diff -r 5db8dfd30ea2 -r c2a05fa925a1 floatobj.cpp --- a/floatobj.cpp Thu Nov 23 16:18:26 2006 +0000 +++ b/floatobj.cpp Fri Dec 08 20:18:56 2006 +0000 @@ -14,17 +14,17 @@ depth=-1; } -FloatObj::FloatObj (Q3Canvas* c):OrnamentedObj(c) +FloatObj::FloatObj (QGraphicsScene* s):OrnamentedObj(s) { -// cout << "Const FloatObj (c) called from MapCenterObj (c)\n"; +// cout << "Const FloatObj (s) called from MapCenterObj (s)\n"; setParObj (this); init(); depth=-1; } -FloatObj::FloatObj (Q3Canvas* c, LinkableMapObj* p):OrnamentedObj (c) +FloatObj::FloatObj (QGraphicsScene* s, LinkableMapObj* p):OrnamentedObj (s) { -// cout << "Const FloatObj (c,p)\n"; +// cout << "Const FloatObj (s,p)\n"; setParObj (p); depth=p->getDepth()+1; init(); @@ -50,12 +50,12 @@ setVisibility (other->visible); } -void FloatObj::setZ(const int &i) +void FloatObj::setZValue(const int &i) { zPlane=i; } -int FloatObj::z() +int FloatObj::zValue() { return zPlane; } @@ -73,12 +73,14 @@ void FloatObj::move (double x, double y) { MapObj::move(x,y); - selbox->move(x,y); + //selbox->setPos(x,y); + selbox->rect().moveTo (QPointF (x,y)); } -void FloatObj::move (QPoint p) +void FloatObj::move (QPointF p) { - move (p.x(), p.y()); + MapObj::move (p); + selbox->rect().moveTo (p); } void FloatObj::setDockPos() @@ -93,12 +95,12 @@ updateLink(); } -QRect FloatObj::getTotalBBox() +QRectF FloatObj::getTotalBBox() { return bbox; } -QRect FloatObj::getBBoxSizeWithChilds() +QRectF FloatObj::getBBoxSizeWithChilds() { return bboxTotal; }