backgroundBrushStyle property has been added

This commit is contained in:
Arin Alexander
2016-12-21 22:09:10 +03:00
parent f72f1a743e
commit 7da0cfd7e2
6 changed files with 77 additions and 52 deletions

View File

@@ -83,7 +83,7 @@ class BaseDesignIntf :
Q_INTERFACES(QGraphicsItem)
Q_ENUMS(BGMode)
Q_ENUMS(Qt::BrushStyle)
Q_ENUMS(BrushMode)
Q_ENUMS(BrushStyle)
Q_ENUMS(ItemAlign)
Q_FLAGS(BorderLines)
Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometryProperty NOTIFY geometryChanged)
@@ -96,8 +96,23 @@ class BaseDesignIntf :
Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor)
public:
enum BGMode { TransparentMode,OpaqueMode};
enum BrushMode{Solid,None};
enum BGMode { TransparentMode, OpaqueMode};
enum BrushStyle{ NoBrush,
SolidPattern,
Dense1Pattern,
Dense2Pattern,
Dense3Pattern,
Dense4Pattern,
Dense5Pattern,
Dense6Pattern,
Dense7Pattern,
HorPattern,
VerPattern,
CrossPattern,
BDiagPattern,
FDiagPattern };
enum ResizeFlags { Fixed = 0,
ResizeLeft = 1,
ResizeRight = 2,
@@ -124,13 +139,13 @@ public:
BaseDesignIntf(const QString& storageTypeName, QObject* owner = 0, QGraphicsItem* parent = 0);
virtual ~BaseDesignIntf();
void setParentReportItem(const QString& value);
void setParentReportItem(const QString& value);
QString parentReportItemName() const;
BrushMode backgroundBrushMode() const {return m_backgroundBrush;}
void setBackgroundBrushMode(BrushMode value);
QColor backgroundColor() const {return m_backgroundBrushcolor;}
void setBackgroundColor(QColor value);
BrushStyle backgroundBrushStyle() const {return m_backgroundBrushStyle;}
void setBackgroundBrushStyle(BrushStyle value);
QColor backgroundColor() const {return m_backgroundColor;}
void setBackgroundColor(QColor value);
QPen pen() const;
void setPen(QPen& pen);
@@ -155,7 +170,7 @@ public:
virtual QSizeF sizeMM() const;
void paint(QPainter* ppainter, const QStyleOptionGraphicsItem* option, QWidget* widget);
void prepareRect(QPainter* ppainter, const QStyleOptionGraphicsItem*, QWidget*);
void prepareRect(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*);
virtual QPainterPath shape() const;
void setFixedPos(bool fixedPos);
@@ -329,13 +344,13 @@ private:
void turnOnSelectionMarker(bool value);
private:
QPointF m_startPos;
//QPointF m_startScenePos;
int m_resizeHandleSize;
int m_selectionPenSize;
int m_possibleResizeDirectionFlags;
int m_possibleMoveDirectionFlags;
int m_resizeDirectionFlags;
qreal m_width, m_height;
qreal m_width;
qreal m_height;
QPen m_pen;
QFont m_font;
QColor m_fontColor;
@@ -357,7 +372,6 @@ private:
QRectF m_rightRect;
QVector<QRectF*> m_resizeAreas;
QFrame* m_hintFrame;
QString m_storageTypeName;
ItemMode m_itemMode;
@@ -365,8 +379,9 @@ private:
SelectionMarker* m_selectionMarker;
Marker* m_joinMarker;
BrushMode m_backgroundBrush;
QColor m_backgroundBrushcolor;
BrushStyle m_backgroundBrushStyle;
QColor m_backgroundColor;
RenderPass m_currentPass;
int m_margin;
QString m_itemTypeName;