[bos #29612] EDF 25161 - dump with comments

diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
index 09900d6b8ce84ee5fc33821ba52d8041693bf884..5f9bf3d8dd86e53fa7662472398a5cc8e0c9fb1d 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
@@ -1275,13 +1275,25 @@ ModelHighAPI_Dumper& ModelHighAPI_Dumper::operator<<(
 ModelHighAPI_Dumper& ModelHighAPI_Dumper::operator<<(
     const std::shared_ptr<ModelAPI_AttributeString>& theAttrStr)
 {
-  // escaping the quote sign in the string under dumping
+  // escaping the quote signs in the string under dumping
   std::string aStr = theAttrStr->value();
+  /*
   size_t aPos = aStr.find("\"");
   while (aPos != std::string::npos) {
     aStr.insert(aPos, "\\");
     aPos = aStr.find("\"", aPos + 2);
   }
+  aPos = aStr.find("\'");
+  while (aPos != std::string::npos) {
+    aStr.insert(aPos, "\\");
+    aPos = aStr.find("\'", aPos + 2);
+  }
+  */
+  size_t aPos = aStr.find_first_of("\"\'");
+  while (aPos != std::string::npos) {
+    aStr.insert(aPos, "\\");
+    aPos = aStr.find_first_of("\"\'", aPos + 2);
+  }
   *myDumpStorage << "'" << aStr << "'";
   return *this;
 }

diff --git a/src/ParametersPlugin/Test/TestQuotesInComment.py b/src/ParametersPlugin/Test/TestQuotesInComment.py
new file mode 100644 (file)
index 0000000..9142a7a
--- /dev/null
+++ b/src/ParametersPlugin/Test/TestQuotesInComment.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2014-2021  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", '10', 'longueur de l\'aile')
+model.addParameter(Part_1_doc, "b", '12', 'trou à l\"origine')
+model.addParameter(Part_1_doc, "c", '14', 'l\'opposé de l\"origine')
+
+Box_1 = model.addBox(Part_1_doc, "a", "b", "c")
+
+model.end()
+
+assert(len(Box_1.feature().error()) == 0)
+assert(model.checkPythonDump())

diff --git a/src/ParametersPlugin/tests.set b/src/ParametersPlugin/tests.set
index 668f4668f7dc1ec70cf97b4ab4e50b3794ea668a..6eaeaf6c1b3082ab21ed80eedba1e75a634631cc 100644 (file)
--- a/src/ParametersPlugin/tests.set
+++ b/src/ParametersPlugin/tests.set
@@ -30,4 +30,5 @@ SET(TEST_NAMES
                Test19036.py
                TestImportParameters.py
                TestImportInvalidParameters.py
+               TestQuotesInComment.py
 )