From: Artem Zhidkov <Artem.Zhidkov@opencascade.com>
Date: Tue, 28 Apr 2020 12:05:40 +0000 (+0300)
Subject: Issue #19036: Can't use a parameter with 1e-5 value in the sketcher
X-Git-Tag: V9_5_0b1~38
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=41b7fc943aeba408734811c2d8be704b29d1738d;p=modules%2Fshaper.git

Issue #19036: Can't use a parameter with 1e-5 value in the sketcher

Improve calculation of the parameter value. Avoid checking the dot in the floating value.
---

diff --git a/src/InitializationPlugin/InitializationPlugin_EvalListener.cpp b/src/InitializationPlugin/InitializationPlugin_EvalListener.cpp
index 03f812776..a8265d441 100644
--- a/src/InitializationPlugin/InitializationPlugin_EvalListener.cpp
+++ b/src/InitializationPlugin/InitializationPlugin_EvalListener.cpp
@@ -49,12 +49,11 @@
 std::string toStdString(double theValue)
 {
   std::ostringstream sstream;
-  sstream << theValue;
-  size_t aPos = sstream.str().find(".");
-  std::string aPnt = "";
-  if (aPos == std::string::npos)
-    aPnt = ".";
-  return sstream.str() + aPnt;
+  // write value in scientific format with 16 digits,
+  // thus, not check the dot position
+  sstream.precision(16);
+  sstream << std::scientific << theValue;
+  return sstream.str();
 }
 
 std::set<std::string> toSet(const std::list<std::string>& theContainer)
diff --git a/src/ParametersPlugin/CMakeLists.txt b/src/ParametersPlugin/CMakeLists.txt
index 6c11d4506..06ec324cd 100644
--- a/src/ParametersPlugin/CMakeLists.txt
+++ b/src/ParametersPlugin/CMakeLists.txt
@@ -122,4 +122,5 @@ ADD_UNIT_TESTS(TestParameterCreation.py
                Test1806.py
                Test2392.py
                Test2474.py
+               Test19036.py
               )
diff --git a/src/ParametersPlugin/Test/Test19036.py b/src/ParametersPlugin/Test/Test19036.py
new file mode 100644
index 000000000..8c49ead55
--- /dev/null
+++ b/src/ParametersPlugin/Test/Test19036.py
@@ -0,0 +1,48 @@
+# Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+model.addParameter(Part_1_doc, "a", "1e-05")
+Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
+SketchLine_1 = Sketch_1.addLine(40, 0.00001, 0, 0.00001)
+SketchLine_2 = Sketch_1.addLine(0, 0.00001, 0, 20.00001)
+SketchLine_3 = Sketch_1.addLine(0, 20.00001, 40, 20.00001)
+SketchLine_4 = Sketch_1.addLine(40, 20.00001, 40, 0.00001)
+Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint())
+Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint())
+Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint())
+Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint())
+Sketch_1.setHorizontal(SketchLine_1.result())
+Sketch_1.setVertical(SketchLine_2.result())
+Sketch_1.setHorizontal(SketchLine_3.result())
+Sketch_1.setVertical(SketchLine_4.result())
+SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False)
+SketchLine_5 = SketchProjection_1.createdFeature()
+Sketch_1.setDistance(SketchLine_1.startPoint(), SketchLine_5.result(), "a", True)
+model.do()
+
+model.end()
+
+assert(Sketch_1.feature().error() == "")
+assert(model.checkPythonDump())