Fix ExtendedString unicode, see #1278

tpaviot · Nov 17, 2023 · 8c40203 · 8c40203
1 parent d1d7628
commit 8c40203
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/SWIG_files/common/FunctionTransformers.i b/src/SWIG_files/common/FunctionTransformers.i
@@ -50,7 +50,7 @@ TCollection_ExtendedString parameter transformation
 
 %typemap(in) TCollection_ExtendedString
 {
-    $1 = TCollection_ExtendedString(PyUnicode_AsUTF8($input));
+    $1 = TCollection_ExtendedString(PyUnicode_AsUTF8($input), true);
 }
 %typemap(typecheck, precedence=SWIG_TYPECHECK_INTEGER) TCollection_ExtendedString {
     $1 = PyUnicode_Check($input) ? 1 : 0;

diff --git a/test/core_wrapper_features_unittest.py b/test/core_wrapper_features_unittest.py
@@ -64,7 +64,7 @@
 )
 from OCC.Core.math import math_Matrix, math_Vector
 from OCC.Core.GC import GC_MakeSegment
-from OCC.Core.STEPControl import STEPControl_Writer
+from OCC.Core.STEPControl import STEPControl_Writer, STEPControl_AsIs
 from OCC.Core.Interface import Interface_Static
 from OCC.Core.GCE2d import GCE2d_MakeSegment
 from OCC.Core.ShapeFix import ShapeFix_Solid, ShapeFix_Wire
@@ -111,6 +111,12 @@
     MethodNotWrappedError,
     ClassNotWrappedError,
 )
+from OCC.Core.BinXCAFDrivers import binxcafdrivers
+from OCC.Core.TDocStd import TDocStd_Application, TDocStd_Document
+from OCC.Core.XCAFDoc import XCAFDoc_DocumentTool
+from OCC.Core.TDataStd import TDataStd_Name
+from OCC.Core.STEPCAFControl import STEPCAFControl_Writer
+from OCC.Core.IFSelect import IFSelect_RetDone
 
 from OCC.Extend.TopologyUtils import TopologyExplorer
 
@@ -968,6 +974,36 @@ def test_deprecated_static_functions(self):
             gp_OX()
         self.assertTrue(isinstance(gp.OX(), gp_Ax1))
 
+    def test_wrap_extendedstring_as_pyunicodestring(self):
+        """not necessary anymore to instanciate a TCollection_ExtendedString,
+        pass a regular python string"""
+        # Create XDE document
+        app = TDocStd_Application()
+        binxcafdrivers.DefineFormat(app)
+        doc = TDocStd_Document(f"example")
+        app.NewDocument("BinXCAF", doc)
+        shape_tool = XCAFDoc_DocumentTool.ShapeTool(doc.Main())
+        shape = BRepPrimAPI_MakeBox(10, 10, 10).Shape()
+        label = shape_tool.AddShape(shape, False)
+
+        a_unicode_string = "Some text with umlauts äöü and japanese (琵琶)"
+        TDataStd_Name.Set(label, a_unicode_string)
+        # Initialize the STEP exporter
+        step_writer = STEPCAFControl_Writer()
+        Interface_Static.SetIVal("write.stepcaf.subshapes.name", 1)
+        Interface_Static.SetCVal("write.step.schema", "AP214")
+        Interface_Static.SetCVal("write.step.product.name", "my product")
+        step_writer.Transfer(doc, STEPControl_AsIs)
+        status = step_writer.Write("compound_with_unicode_label.step")
+
+        if status != IFSelect_RetDone:
+            raise AssertionError("write failed")
+
+        # check that the unicode string was actually exported to file
+        with open("compound_with_unicode_label.step", "r", encoding="utf8") as f:
+            step_file_content = f.read()
+            self.assertTrue(a_unicode_string in step_file_content)
+
 
 def suite() -> unittest.TestSuite:
     test_suite = unittest.TestSuite()