From 129e579612eba264c8dc52709f6578ee33cc5d4c Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 25 Jun 2014 16:32:31 +0300 Subject: [PATCH] Refactoring. --HG-- branch : develop --- src/app/tools/drawTools/vtoolcutarc.cpp | 15 +++++---------- src/app/widgets/vsimplearc.cpp | 8 ++++++++ src/app/widgets/vsimplearc.h | 1 + 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index fec7ac05c..8c0571a36 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -230,24 +230,19 @@ void VToolCutArc::ArcChoosed(quint32 id) */ void VToolCutArc::ChangedActivDraw(const QString &newName) { + bool flag = true; if (nameActivDraw == newName) { currentColor = Qt::black; - firstArc->setFlag(QGraphicsItem::ItemIsSelectable, true); - firstArc->setAcceptHoverEvents(true); - secondArc->setFlag(QGraphicsItem::ItemIsSelectable, true); - secondArc->setAcceptHoverEvents(true); + flag = true; } else { currentColor = Qt::gray; - firstArc->setFlag(QGraphicsItem::ItemIsSelectable, false); - firstArc->setAcceptHoverEvents(false); - secondArc->setFlag(QGraphicsItem::ItemIsSelectable, false); - secondArc->setAcceptHoverEvents(false); + flag = false; } - firstArc->setPen(QPen(currentColor, qApp->toPixel(qApp->widthHairLine())/factor)); - secondArc->setPen(QPen(currentColor, qApp->toPixel(qApp->widthHairLine())/factor)); + firstArc->ChangedActivDraw(flag); + secondArc->ChangedActivDraw(flag); VToolPoint::ChangedActivDraw(newName); } diff --git a/src/app/widgets/vsimplearc.cpp b/src/app/widgets/vsimplearc.cpp index f7f4d4079..ea5692f36 100644 --- a/src/app/widgets/vsimplearc.cpp +++ b/src/app/widgets/vsimplearc.cpp @@ -54,6 +54,14 @@ VSimpleArc::VSimpleArc(quint32 id, Qt::GlobalColor *currentColor, qreal *factor, setAcceptHoverEvents(true); } +//--------------------------------------------------------------------------------------------------------------------- +void VSimpleArc::ChangedActivDraw(const bool &flag) +{ + setFlag(QGraphicsItem::ItemIsSelectable, flag); + setAcceptHoverEvents(flag); + setPen(QPen(*currentColor, qApp->toPixel(qApp->widthHairLine())/ *factor)); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief mouseReleaseEvent handle mouse release events. diff --git a/src/app/widgets/vsimplearc.h b/src/app/widgets/vsimplearc.h index 8a0f9b725..09792ae5e 100644 --- a/src/app/widgets/vsimplearc.h +++ b/src/app/widgets/vsimplearc.h @@ -41,6 +41,7 @@ class VSimpleArc : public QObject, public QGraphicsPathItem Q_OBJECT public: VSimpleArc(quint32 id, Qt::GlobalColor *currentColor, qreal *factor = nullptr, QObject *parent = nullptr); + void ChangedActivDraw(const bool &flag); signals: /** * @brief Choosed send id when clicked.