Refactor frame and markup code to use paths.

- CD frames are currently broken.

libglabels/FrameEllipse.h

@@ -45,8 +45,8 @@ namespace libglabels
 		const QString sizeDescription( const Units* units ) const;
 		bool isSimilarTo( Frame* other ) const;
 
-		const QPainterPath& path( bool isRotated ) const;
-		QGraphicsItem* createMarginGraphicsItem( double size, const QPen& pen ) const;
+		const QPainterPath& path() const;
+		QPainterPath marginPath( double size ) const;
 
 
 	private:
@@ -55,7 +55,6 @@ namespace libglabels
 		double mWaste;
 
 		QPainterPath mPath;
-		QPainterPath mRotatedPath;
 
 	};