diff -r b7447adddc9a -r 5522d1da7e37 frameobj.cpp --- a/frameobj.cpp Wed Jan 10 13:26:12 2007 +0000 +++ b/frameobj.cpp Tue Jan 23 11:50:53 2007 +0000 @@ -37,6 +37,9 @@ case Rectangle: delete rectFrame; break; + case Ellipse: + delete ellipseFrame; + break; } type=NoFrame; border=0; @@ -51,6 +54,9 @@ case Rectangle: rectFrame->setPos (x,y); break; + case Ellipse: + ellipseFrame->setPos (x,y); + break; } } @@ -77,6 +83,9 @@ case Rectangle: rectFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() )); break; + case Ellipse: + ellipseFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() )); + break; } } @@ -97,6 +106,9 @@ case Rectangle: return "Rectangle"; break; + case Ellipse: + return "Ellipse"; + break; default: return "NoFrame"; } @@ -117,7 +129,11 @@ border=10; rectFrame = scene->addRect(QRectF(0,0,0,0), QPen(QColor("black") ), QColor("white")); rectFrame->setZValue(Z_FRAME); - + break; + case Ellipse: + border=10; + ellipseFrame = scene->addEllipse(QRectF(0,0,0,0), QPen(QColor("black") ), QColor("white")); + ellipseFrame->setZValue(Z_FRAME); break; } setVisibility (visible); @@ -128,6 +144,8 @@ { if (t=="Rectangle") FrameObj::setFrameType (Rectangle); + else if (t=="Ellipse") + FrameObj::setFrameType (Ellipse); else FrameObj::setFrameType (NoFrame); } @@ -145,6 +163,18 @@ else rectFrame->hide(); break; + case Ellipse: + if (visible) + ellipseFrame->show(); + else + ellipseFrame->hide(); + break; } } +QString FrameObj::saveToDir () +{ + QString frameTypeAttr=attribut ("frameType",getFrameTypeName()); + return singleElement ("frame",frameTypeAttr); +} +