diff -r 5db8dfd30ea2 -r c2a05fa925a1 flagobj.cpp --- a/flagobj.cpp Thu Nov 23 16:18:26 2006 +0000 +++ b/flagobj.cpp Fri Dec 08 20:18:56 2006 +0000 @@ -9,9 +9,9 @@ init (); } -FlagObj::FlagObj(Q3Canvas* c):MapObj(c) +FlagObj::FlagObj(QGraphicsScene* s):MapObj(s) { -// cout << "Const FlagObj canvas="<move (absPos.x(), absPos.y() ); + icon=new ImageObj (scene); + icon->setPos (absPos.x(), absPos.y() ); state=false; action=NULL; } @@ -53,7 +53,7 @@ void FlagObj::move(double x, double y) { MapObj::move(x,y); - icon->move(x,y); + icon->setPos(x,y); positionBBox(); } @@ -117,7 +117,7 @@ QPixmap FlagObj::getPixmap() { - return icon->getPixmap(); + return icon->pixmap(); } void FlagObj::setAction (QAction* a) @@ -150,6 +150,8 @@ if (visible) { icon->setVisibility (true); + //icon->setPos (100,100); + //icon->setPos (rand()%100,rand()%130); calcBBoxSize(); } } @@ -191,12 +193,12 @@ { if (visible && state) { - bbox.setSize ( QSize( + bbox.setSize ( QSizeF( icon->boundingRect().width(), icon->boundingRect().height() ) ); } else { - bbox.setSize (QSize(0,0)); + bbox.setSize (QSizeF(0,0)); } clickBox.setSize (bbox.size()); }