From ffa241ea0d7ec48cde3eadf19a64bd478e25c16f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 3 Dec 2016 18:51:36 +0200 Subject: [PATCH] Removed brush for main path. --HG-- branch : feature --- src/libs/vtools/tools/vtoolseamallowance.cpp | 11 +++++------ src/libs/vtools/tools/vtoolseamallowance.h | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index d721844eb..b3d052731 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -488,14 +488,14 @@ QVariant VToolSeamAllowance::itemChange(QGraphicsItem::GraphicsItemChange change } } - return VNoBrushScalePathItem::itemChange(change, value); + return QGraphicsPathItem::itemChange(change, value); } //--------------------------------------------------------------------------------------------------------------------- void VToolSeamAllowance::mousePressEvent(QGraphicsSceneMouseEvent *event) { // Special for not selectable item first need to call standard mousePressEvent then accept event - VNoBrushScalePathItem::mousePressEvent(event); + QGraphicsPathItem::mousePressEvent(event); // Somehow clicking on notselectable object do not clean previous selections. if (not (flags() & ItemIsSelectable) && scene()) @@ -528,7 +528,7 @@ void VToolSeamAllowance::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) //Disable cursor-arrow-closehand RestoreOverrideCursor(cursorArrowCloseHand); } - VNoBrushScalePathItem::mouseReleaseEvent(event); + QGraphicsPathItem::mouseReleaseEvent(event); } //--------------------------------------------------------------------------------------------------------------------- @@ -630,7 +630,7 @@ void VToolSeamAllowance::keyReleaseEvent(QKeyEvent *event) break; } - VNoBrushScalePathItem::keyReleaseEvent ( event ); + QGraphicsPathItem::keyReleaseEvent ( event ); } //--------------------------------------------------------------------------------------------------------------------- @@ -648,7 +648,7 @@ VToolSeamAllowance::VToolSeamAllowance(VAbstractPattern *doc, VContainer *data, const Source &typeCreation, VMainGraphicsScene *scene, const QString &drawName, QGraphicsItem *parent) : VAbstractTool(doc, data, id), - VNoBrushScalePathItem(parent), + QGraphicsPathItem(parent), m_dialog(), m_sceneDetails(scene), m_drawName(drawName), @@ -662,7 +662,6 @@ VToolSeamAllowance::VToolSeamAllowance(VAbstractPattern *doc, VContainer *data, this->setFlag(QGraphicsItem::ItemIsSelectable, true); RefreshGeometry(); - this->setBrush(QBrush(Qt::Dense7Pattern)); m_seamAllowance->setBrush(QBrush(Qt::FDiagPattern)); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); diff --git a/src/libs/vtools/tools/vtoolseamallowance.h b/src/libs/vtools/tools/vtoolseamallowance.h index 3750b0823..e23ef708e 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.h +++ b/src/libs/vtools/tools/vtoolseamallowance.h @@ -32,6 +32,7 @@ #include #include #include +#include #include "../vwidgets/vnobrushscalepathitem.h" #include "vabstracttool.h" @@ -40,7 +41,7 @@ class VMainGraphicsScene; class DialogTool; class VPiece; -class VToolSeamAllowance : public VAbstractTool, public VNoBrushScalePathItem +class VToolSeamAllowance : public VAbstractTool, public QGraphicsPathItem { Q_OBJECT public: