From 49776041062744b98fb2f5a0186b493eee1deb16 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 11 Jan 2016 13:24:37 +0200 Subject: [PATCH] Correct disabling line to the label. --HG-- branch : develop --- src/libs/vlayout/vabstractdetail.cpp | 2 +- .../drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/vlayout/vabstractdetail.cpp b/src/libs/vlayout/vabstractdetail.cpp index 6419c4c77..47a8d5f25 100644 --- a/src/libs/vlayout/vabstractdetail.cpp +++ b/src/libs/vlayout/vabstractdetail.cpp @@ -340,7 +340,7 @@ QVector VAbstractDetail::CheckLoops(const QVector &points) { // Break, but not if intersects the first edge and the last edge in closed path if (line1.p1() != crosPoint && line1.p2() != crosPoint && line2.p1() != crosPoint && line2.p2() != crosPoint) - { + { // Break, but not if loop creates crosPoint when it is first or last point of lines break; } } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index c8c4fcb81..63d995980 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -108,6 +108,7 @@ void VToolSinglePoint::setName(const QString &name) void VToolSinglePoint::SetEnabled(bool enabled) { SetToolEnabled(this, enabled); + SetToolEnabled(lineName, enabled); } //---------------------------------------------------------------------------------------------------------------------