From ed0d4df88f1206ad10335aad1c01ea487d4fc594 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 7 Jul 2016 14:35:55 +0300 Subject: [PATCH] Fixed wrong color segment that connects label with point in Base point tool. --HG-- branch : develop --- .../toolpoint/tooldoublepoint/vtooldoublepoint.cpp | 2 +- .../toolpoint/toolsinglepoint/vtoolsinglepoint.cpp | 4 ++-- src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp index 830fa8982..5ef6e7e6d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp @@ -89,7 +89,7 @@ void VToolDoublePoint::setNameP2(const QString &name) //--------------------------------------------------------------------------------------------------------------------- void VToolDoublePoint::SetEnabled(bool enabled) { - SetToolEnabled(this, enabled); + SetToolEnabled(this, baseColor, enabled); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index 6a880c460..3778ffffe 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -94,8 +94,8 @@ void VToolSinglePoint::setName(const QString &name) //--------------------------------------------------------------------------------------------------------------------- void VToolSinglePoint::SetEnabled(bool enabled) { - SetToolEnabled(this, enabled); - SetToolEnabled(lineName, enabled); + SetToolEnabled(this, baseColor, enabled); + SetToolEnabled(lineName, Qt::black, enabled); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index ecb7e5c64..c818f6c66 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -60,7 +60,7 @@ protected: virtual void RefreshLine(quint32 id)=0; template - void SetToolEnabled(T *item, bool enabled); + void SetToolEnabled(T *item, const QColor &color, bool enabled); template static void InitToolConnections(VMainGraphicsScene *scene, T *tool); @@ -97,12 +97,12 @@ void VAbstractPoint::ShowToolVisualization(bool show) //--------------------------------------------------------------------------------------------------------------------- template -void VAbstractPoint::SetToolEnabled(T *item, bool enabled) +void VAbstractPoint::SetToolEnabled(T *item, const QColor &color, bool enabled) { item->setEnabled(enabled); if (enabled) { - item->setPen(QPen(QColor(baseColor), + item->setPen(QPen(color, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit()))/factor)); } else