1.1 --- a/ornamentedobj.cpp	Fri Jan 05 11:17:32 2007 +0000
     1.2 +++ b/ornamentedobj.cpp	Sat Mar 31 09:28:27 2007 +0000
     1.3 @@ -31,9 +31,10 @@
     1.4  
     1.5  OrnamentedObj::~OrnamentedObj()
     1.6  {
     1.7 -    delete (heading);
     1.8 -	delete (systemFlags);
     1.9 -	delete (standardFlags);
    1.10 +    delete heading;
    1.11 +	delete systemFlags;
    1.12 +	delete standardFlags;
    1.13 +	delete frame;
    1.14  }
    1.15  
    1.16  
    1.17 @@ -54,6 +55,8 @@
    1.18  	standardFlags->clone(standardFlagsDefault);
    1.19  	standardFlags->setName ("standardFlags");
    1.20  
    1.21 +	frame = new FrameObj (scene);
    1.22 +
    1.23  	hideExport=false;
    1.24  	hidden=false;
    1.25  
    1.26 @@ -103,6 +106,56 @@
    1.27      return heading->getColor();
    1.28  }
    1.29  
    1.30 +FrameType OrnamentedObj::getFrameType()
    1.31 +{
    1.32 +	return frame->getFrameType();
    1.33 +}
    1.34 +
    1.35 +void OrnamentedObj::setFrameType(const FrameType &t)
    1.36 +{
    1.37 +	frame->setFrameType(t);
    1.38 +	if (t == NoFrame)
    1.39 +		linkpos=LinkBottom;
    1.40 +	else	
    1.41 +		linkpos=LinkMiddle;
    1.42 +
    1.43 +	calcBBoxSize();
    1.44 +	positionBBox();
    1.45 +	requestReposition();
    1.46 +}
    1.47 +
    1.48 +void OrnamentedObj::setFrameType(const QString &t)
    1.49 +{
    1.50 +	frame->setFrameType(t);
    1.51 +	if (frame->getFrameType() == NoFrame)
    1.52 +		linkpos=LinkBottom;
    1.53 +	else	
    1.54 +		linkpos=LinkMiddle;
    1.55 +
    1.56 +	calcBBoxSize();
    1.57 +	positionBBox();
    1.58 +	requestReposition();
    1.59 +}
    1.60 +
    1.61 +void OrnamentedObj::setFramePenColor(QColor col)
    1.62 +{
    1.63 +	frame->setPenColor (col);
    1.64 +}
    1.65 +
    1.66 +QColor OrnamentedObj::getFramePenColor()
    1.67 +{
    1.68 +	return frame->getPenColor ();
    1.69 +}
    1.70 +
    1.71 +void OrnamentedObj::setFrameBrushColor(QColor col)
    1.72 +{
    1.73 +	frame->setBrushColor (col);
    1.74 +}
    1.75 +
    1.76 +QColor OrnamentedObj::getFrameBrushColor()
    1.77 +{
    1.78 +	return frame->getBrushColor ();
    1.79 +}
    1.80  
    1.81  void OrnamentedObj::positionContents()
    1.82  {