From aee0861aef868b4635b583ae9b914c779b203220 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Mon, 27 May 2019 19:14:07 +0300
Subject: [PATCH] Fixing regression in method DialogTool::GetNodeName. (grafted
 from 85f1cc324da4971357555e1e1f0aec51eac0f743)

--HG--
branch : develop
---
 ChangeLog.txt                                |  1 +
 src/libs/vtools/dialogs/tools/dialogtool.cpp | 10 +++++-----
 src/libs/vtools/dialogs/tools/dialogtool.h   |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3ca35c5cf..8e864d6eb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -48,6 +48,7 @@
 - [#967] Variable must not include new line character.
 - German translation for Inno setup script.
 - [#971] Group operation do not work with VCubicBezierPath.
+- Regression in method DialogTool::GetNodeName.
 
 # Version 0.6.1 October 23, 2018
 - [#885] Regression. Broken support for multi size measurements.
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp
index 2767e3f07..8b9793e29 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp
@@ -394,7 +394,7 @@ quint32 DialogTool::DNumber(const QString &baseName) const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
+QString DialogTool::GetNodeName(const VPieceNode &node, bool showPassmarkDetails) const
 {
     const QSharedPointer<VGObject> obj = data->GetGObject(node.GetId());
     QString name = obj->name();
@@ -404,14 +404,14 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
         int bias = 0;
         qApp->TrVars()->VariablesToUser(name, 0, obj->name(), bias);
 
-        if (showDetails && node.GetReverse())
+        if (node.GetReverse())
         {
-            name = QLatin1String("- ") + name;
+            name = QStringLiteral("- ") + name;
         }
     }
     else
     {
-        if (showDetails && node.IsPassmark())
+        if (showPassmarkDetails && node.IsPassmark())
         {
             switch(node.GetPassmarkLineType())
             {
@@ -444,7 +444,7 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
             }
         }
 
-        if (showDetails && not node.IsCheckUniqueness())
+        if (not node.IsCheckUniqueness())
         {
             name = QLatin1Char('[') + name + QLatin1Char(']');
         }
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h
index d743acf85..2f8d4d822 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.h
+++ b/src/libs/vtools/dialogs/tools/dialogtool.h
@@ -209,7 +209,7 @@ protected:
      */
     virtual void     SaveData() {}
     quint32          DNumber(const QString &baseName) const;
-    QString          GetNodeName(const VPieceNode &node, bool showDetails = false) const;
+    QString          GetNodeName(const VPieceNode &node, bool showPassmarkDetails = false) const;
     void             NewNodeItem(QListWidget *listWidget, const VPieceNode &node, bool showPassmark = true);
 
     void             InitNodeAngles(QComboBox *box);