1.1 --- a/frameobj.cpp	Wed Jan 10 13:26:12 2007 +0000
     1.2 +++ b/frameobj.cpp	Tue Jan 23 11:50:53 2007 +0000
     1.3 @@ -37,6 +37,9 @@
     1.4  		case Rectangle:
     1.5  			delete rectFrame;
     1.6  			break;
     1.7 +		case Ellipse:
     1.8 +			delete ellipseFrame;
     1.9 +			break;
    1.10      }
    1.11  	type=NoFrame;
    1.12  	border=0;
    1.13 @@ -51,6 +54,9 @@
    1.14  		case Rectangle:
    1.15  			rectFrame->setPos (x,y);
    1.16  			break;
    1.17 +		case Ellipse:
    1.18 +			ellipseFrame->setPos (x,y);
    1.19 +			break;
    1.20      }
    1.21  }
    1.22  
    1.23 @@ -77,6 +83,9 @@
    1.24  		case Rectangle:
    1.25  			rectFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() ));
    1.26  			break;
    1.27 +		case Ellipse:
    1.28 +			ellipseFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() ));
    1.29 +			break;
    1.30      }
    1.31  }
    1.32  
    1.33 @@ -97,6 +106,9 @@
    1.34  		case Rectangle:
    1.35  			return "Rectangle";
    1.36  			break;
    1.37 +		case Ellipse:
    1.38 +			return "Ellipse";
    1.39 +			break;
    1.40  		default:
    1.41  			return "NoFrame";
    1.42      }
    1.43 @@ -117,7 +129,11 @@
    1.44  				border=10;
    1.45  				rectFrame = scene->addRect(QRectF(0,0,0,0), QPen(QColor("black") ), QColor("white"));
    1.46  				rectFrame->setZValue(Z_FRAME);
    1.47 -
    1.48 +				break;
    1.49 +			case Ellipse:
    1.50 +				border=10;
    1.51 +				ellipseFrame = scene->addEllipse(QRectF(0,0,0,0), QPen(QColor("black") ), QColor("white"));
    1.52 +				ellipseFrame->setZValue(Z_FRAME);
    1.53  				break;
    1.54  		}
    1.55  		setVisibility (visible);
    1.56 @@ -128,6 +144,8 @@
    1.57  {
    1.58  	if (t=="Rectangle")
    1.59  		FrameObj::setFrameType (Rectangle);
    1.60 +	else if (t=="Ellipse")	
    1.61 +		FrameObj::setFrameType (Ellipse);
    1.62  	else	
    1.63  		FrameObj::setFrameType (NoFrame);
    1.64  }
    1.65 @@ -145,6 +163,18 @@
    1.66  			else    
    1.67  				rectFrame->hide();
    1.68  			break;
    1.69 +		case Ellipse:
    1.70 +			if (visible)
    1.71 +				ellipseFrame->show();
    1.72 +			else    
    1.73 +				ellipseFrame->hide();
    1.74 +			break;
    1.75  	}
    1.76  }
    1.77  
    1.78 +QString FrameObj::saveToDir ()
    1.79 +{
    1.80 +	QString	frameTypeAttr=attribut ("frameType",getFrameTypeName());
    1.81 +	return singleElement ("frame",frameTypeAttr);
    1.82 +}
    1.83 +