From 8b7567c32a9e36f065c0d3dd537c96f4e465fcbd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 4 Feb 2015 15:09:37 +0200 Subject: [PATCH] Use method setEnabled instead direct change Pen where possible. --HG-- branch : feature --- src/app/tools/drawTools/vtoolline.cpp | 1 - src/app/tools/drawTools/vtoollinepoint.cpp | 2 +- src/app/tools/drawTools/vtoolsinglepoint.cpp | 20 -------------------- src/app/tools/drawTools/vtoolsinglepoint.h | 1 - src/app/visualization/vsimplecurve.cpp | 3 +-- 5 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp index 618448867..42b3bce4d 100644 --- a/src/app/tools/drawTools/vtoolline.cpp +++ b/src/app/tools/drawTools/vtoolline.cpp @@ -239,7 +239,6 @@ void VToolLine::ChangedActivDraw(const QString &newName) { VDrawTool::ChangedActivDraw(newName); this->setEnabled(nameActivDraw == newName); - this->setPen(QPen(currentColor, qApp->toPixel(qApp->widthHairLine())/factor, LineStyleToPenStyle(typeLine))); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/tools/drawTools/vtoollinepoint.cpp b/src/app/tools/drawTools/vtoollinepoint.cpp index 59823347e..598c84c32 100644 --- a/src/app/tools/drawTools/vtoollinepoint.cpp +++ b/src/app/tools/drawTools/vtoollinepoint.cpp @@ -71,7 +71,7 @@ void VToolLinePoint::ChangedActivDraw(const QString &newName) { VToolPoint::ChangedActivDraw(newName); this->setEnabled(nameActivDraw == newName); - mainLine->setPen(QPen(currentColor, qApp->toPixel(qApp->widthHairLine())/factor, LineStyleToPenStyle(typeLine))); + mainLine->setEnabled(nameActivDraw == newName); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index 204849b16..069e79ffc 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -299,26 +299,6 @@ void VToolSinglePoint::FullUpdateFromFile() RefreshPointGeometry(point); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief ChangedActivDraw disable or enable context menu after change active pattern peace. - * @param newName new name active pattern peace. - */ -void VToolSinglePoint::ChangedActivDraw(const QString &newName) -{ - VToolPoint::ChangedActivDraw(newName); - if (nameActivDraw == newName) - { - this->setEnabled(true); - SetColorLabel(Qt::black); - } - else - { - this->setEnabled(false); - SetColorLabel(Qt::gray); - } -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief SetFactor set current scale factor of scene. diff --git a/src/app/tools/drawTools/vtoolsinglepoint.h b/src/app/tools/drawTools/vtoolsinglepoint.h index 3cbcdb202..df2727580 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.h +++ b/src/app/tools/drawTools/vtoolsinglepoint.h @@ -48,7 +48,6 @@ public: virtual void ShowVisualization(bool show); public slots: virtual void FullUpdateFromFile(); - virtual void ChangedActivDraw(const QString &newName); virtual void SetFactor(qreal factor); virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event); signals: diff --git a/src/app/visualization/vsimplecurve.cpp b/src/app/visualization/vsimplecurve.cpp index 92ba03fba..10c3927b0 100644 --- a/src/app/visualization/vsimplecurve.cpp +++ b/src/app/visualization/vsimplecurve.cpp @@ -60,8 +60,7 @@ VSimpleCurve::VSimpleCurve(quint32 id, Qt::GlobalColor *currentColor, SimpleCurv //--------------------------------------------------------------------------------------------------------------------- void VSimpleCurve::ChangedActivDraw(const bool &flag) { - setFlag(QGraphicsItem::ItemIsSelectable, flag); - setAcceptHoverEvents(flag); + setEnabled(flag); setPen(QPen(*currentColor, qApp->toPixel(qApp->widthHairLine())/ *factor)); }