From 096f4714262ecc3430aefa4f7516aab1e8fbfcd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= Date: Tue, 12 Jul 2022 17:12:37 +0200 Subject: [PATCH] [TechDraw] Improve readability of TaskLineDim.cpp --- src/Mod/TechDraw/Gui/TaskLinkDim.cpp | 47 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp index b18d0933e3..cab406b9fb 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp @@ -144,37 +144,38 @@ void TaskLinkDim::loadToTree(const TechDraw::DrawViewDimension* dim, const bool //! does this dim already have a reference to the selection? bool TaskLinkDim::dimReferencesSelection(const TechDraw::DrawViewDimension* dim) const { - bool result = false; if (!dim->has3DReferences()) { - return result; + return false; } std::vector refParts = dim->References3D.getValues(); std::vector refSubs = dim->References3D.getSubValues(); - if (refParts.size() == m_parts.size()) { - if(refParts.size() == 0) { - //shouldn't happen! - } else if (refParts.size() == 1) { - if ((refParts[0] == m_parts[0]) && - (refSubs[0] == m_subs[0]) ) { //everything matches - result = true; - } - } else if (refParts.size() == 2) { - if (( (refParts[0] == m_parts[0]) && - (refParts[1] == m_parts[1]) ) && - ( (refSubs[0] == m_subs[0]) && - (refSubs[1] == m_subs[1]) ) ) { - result = true; - } else if (( (refParts[0] == m_parts[1]) && - (refParts[1] == m_parts[0]) ) && - ( (refSubs[0] == m_subs[1]) && - (refSubs[1] == m_subs[0]) ) ) { - result = true; - } + if (refParts.size() != m_parts.size()) { + return false; + } + + if(refParts.size() == 0) { + //shouldn't happen! + } else if (refParts.size() == 1) { + if ((refParts[0] == m_parts[0]) && + (refSubs[0] == m_subs[0]) ) { //everything matches + return true; + } + } else if (refParts.size() == 2) { + if (( (refParts[0] == m_parts[0]) && + (refParts[1] == m_parts[1]) ) && + ( (refSubs[0] == m_subs[0]) && + (refSubs[1] == m_subs[1]) ) ) { + return true; + } else if (( (refParts[0] == m_parts[1]) && + (refParts[1] == m_parts[0]) ) && + ( (refSubs[0] == m_subs[1]) && + (refSubs[1] == m_subs[0]) ) ) { + return true; } } - return result; + return false; } void TaskLinkDim::updateDims()