Added intermediate base class for shape objects (box and ellipse).

This commit is contained in:
Jim Evins
2015-08-14 09:43:18 -04:00
parent 6a06771036
commit aeb6098159
5 changed files with 252 additions and 154 deletions
+3 -45
View File
@@ -21,7 +21,8 @@
#ifndef glabels_LabelModelBoxObject_h
#define glabels_LabelModelBoxObject_h
#include "LabelModelObject.h"
#include "LabelModelShapeObject.h"
namespace glabels
@@ -30,7 +31,7 @@ namespace glabels
///
/// Label Model Box Object
///
class LabelModelBoxObject : public LabelModelObject
class LabelModelBoxObject : public LabelModelShapeObject
{
Q_OBJECT
@@ -42,40 +43,6 @@ namespace glabels
virtual ~LabelModelBoxObject();
///////////////////////////////////////////////////////////////
// Property Implementations
///////////////////////////////////////////////////////////////
public:
//
// Shape Property: lineWidth
//
virtual double lineWidth( void ) const;
virtual void setLineWidth( double value );
//
// Shape Property: lineColorNode
//
virtual ColorNode lineColorNode( void ) const;
virtual void setLineColorNode( const ColorNode& value );
//
// Shape Property: fillColorNode
//
virtual ColorNode fillColorNode( void ) const;
virtual void setFillColorNode( const ColorNode& value );
///////////////////////////////////////////////////////////////
// Capability Implementations
///////////////////////////////////////////////////////////////
public:
virtual bool canFill();
virtual bool canLineColor();
virtual bool canLineWidth();
///////////////////////////////////////////////////////////////
// Drawing operations
///////////////////////////////////////////////////////////////
@@ -83,15 +50,6 @@ namespace glabels
virtual void drawShadow( QPainter* painter, bool inEditor, MergeRecord* record ) const;
virtual void drawObject( QPainter* painter, bool inEditor, MergeRecord* record ) const;
///////////////////////////////////////////////////////////////
// Private Members
///////////////////////////////////////////////////////////////
private:
double mLineWidth;
ColorNode mLineColorNode;
ColorNode mFillColorNode;
};
}