aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve API for class VNoBrushScalePathItem. Added method SetWidth().

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-03-26 17:26:15 +02:00
parent c4d07125dc
commit 263b99ff19
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/vwidgets/vnobrushscalepathitem.cpp
View File

@ -28,6 +28,7 @@
#include "vnobrushscalepathitem.h" #include "vnobrushscalepathitem.h"
#include "global.h" #include "global.h"
#include "../vmisc/vabstractapplication.h"
#include <QBrush> #include <QBrush>
#include <QMatrix> #include <QMatrix>
@ -35,10 +36,17 @@
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VNoBrushScalePathItem::VNoBrushScalePathItem(QGraphicsItem *parent) : VNoBrushScalePathItem::VNoBrushScalePathItem(QGraphicsItem *parent) :
QGraphicsPathItem(parent) QGraphicsPathItem(parent),
m_defaultWidth(qApp->Settings()->WidthHairLine())
{ {
} }
//---------------------------------------------------------------------------------------------------------------------
void VNoBrushScalePathItem::SetWidth(qreal width)
{
m_defaultWidth = width;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VNoBrushScalePathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void VNoBrushScalePathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{ {
@ -57,5 +65,10 @@ void VNoBrushScalePathItem::paint(QPainter *painter, const QStyleOptionGraphicsI
QBrush brush = this->brush(); QBrush brush = this->brush();
brush.setMatrix(painter->combinedMatrix().inverted()); brush.setMatrix(painter->combinedMatrix().inverted());
this->setBrush(brush); this->setBrush(brush);
QPen toolPen = pen();
toolPen.setWidthF(ScaleWidth(m_defaultWidth, SceneScale(scene())));
setPen(toolPen);
PaintWithFixItemHighlightSelected<QGraphicsPathItem>(this, painter, option, widget); PaintWithFixItemHighlightSelected<QGraphicsPathItem>(this, painter, option, widget);
} }

3
src/libs/vwidgets/vnobrushscalepathitem.h
View File

@ -40,6 +40,8 @@ class VNoBrushScalePathItem : public QGraphicsPathItem
public: public:
explicit VNoBrushScalePathItem(QGraphicsItem *parent = nullptr); explicit VNoBrushScalePathItem(QGraphicsItem *parent = nullptr);
void SetWidth(qreal width);
protected: protected:
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option,
QWidget * widget = nullptr) override; QWidget * widget = nullptr) override;
@ -49,6 +51,7 @@ protected:
private: private:
Q_DISABLE_COPY(VNoBrushScalePathItem) Q_DISABLE_COPY(VNoBrushScalePathItem)
qreal m_defaultWidth;
}; };
#endif // VNOBRUSHSCALEPATHITEM_H #endif // VNOBRUSHSCALEPATHITEM_H