From ab19b30713ae630311682e2b18aec7a204c70708 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 6 Mar 2014 15:35:14 +0200 Subject: [PATCH] Refactoring. --HG-- branch : feature --- src/tools/drawTools/vtoolcutspline.cpp | 17 +++++++++-------- src/tools/drawTools/vtoolcutsplinepath.cpp | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/tools/drawTools/vtoolcutspline.cpp b/src/tools/drawTools/vtoolcutspline.cpp index 678b11eeb..0e83bdfac 100644 --- a/src/tools/drawTools/vtoolcutspline.cpp +++ b/src/tools/drawTools/vtoolcutspline.cpp @@ -178,23 +178,24 @@ void VToolCutSpline::SplineChoosed(quint32 id) void VToolCutSpline::ChangedActivDraw(const QString &newName) { + bool flag = true; if (nameActivDraw == newName) { currentColor = Qt::black; - firstSpline->setFlag(QGraphicsItem::ItemIsSelectable, true); - firstSpline->setAcceptHoverEvents(true); - secondSpline->setFlag(QGraphicsItem::ItemIsSelectable, true); - secondSpline->setAcceptHoverEvents(true); + flag = true; } else { currentColor = Qt::gray; - firstSpline->setFlag(QGraphicsItem::ItemIsSelectable, false); - firstSpline->setAcceptHoverEvents(false); - secondSpline->setFlag(QGraphicsItem::ItemIsSelectable, false); - secondSpline->setAcceptHoverEvents(false); + flag = false; } + + firstSpline->setFlag(QGraphicsItem::ItemIsSelectable, flag); + firstSpline->setAcceptHoverEvents(flag); firstSpline->setPen(QPen(currentColor, toPixel(widthHairLine)/factor)); + + secondSpline->setFlag(QGraphicsItem::ItemIsSelectable, flag); + secondSpline->setAcceptHoverEvents(flag); secondSpline->setPen(QPen(currentColor, toPixel(widthHairLine)/factor)); VToolPoint::ChangedActivDraw(newName); } diff --git a/src/tools/drawTools/vtoolcutsplinepath.cpp b/src/tools/drawTools/vtoolcutsplinepath.cpp index 80fd71cfb..6eab2f31c 100644 --- a/src/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/tools/drawTools/vtoolcutsplinepath.cpp @@ -259,23 +259,24 @@ void VToolCutSplinePath::SplineChoosed(quint32 id) void VToolCutSplinePath::ChangedActivDraw(const QString &newName) { + bool flag = true; if (nameActivDraw == newName) { currentColor = Qt::black; - firstSpline->setFlag(QGraphicsItem::ItemIsSelectable, true); - firstSpline->setAcceptHoverEvents(true); - secondSpline->setFlag(QGraphicsItem::ItemIsSelectable, true); - secondSpline->setAcceptHoverEvents(true); + flag = true; } else { currentColor = Qt::gray; - firstSpline->setFlag(QGraphicsItem::ItemIsSelectable, false); - firstSpline->setAcceptHoverEvents(false); - secondSpline->setFlag(QGraphicsItem::ItemIsSelectable, false); - secondSpline->setAcceptHoverEvents(false); + flag = false; } + + firstSpline->setFlag(QGraphicsItem::ItemIsSelectable, flag); + firstSpline->setAcceptHoverEvents(flag); firstSpline->setPen(QPen(currentColor, toPixel(widthHairLine)/factor)); + + secondSpline->setFlag(QGraphicsItem::ItemIsSelectable, flag); + secondSpline->setAcceptHoverEvents(flag); secondSpline->setPen(QPen(currentColor, toPixel(widthHairLine)/factor)); VToolPoint::ChangedActivDraw(newName); }