update to string wrapper changes

Author: tpaviot

examples/core_export_gltf_single_shape.py

@@ -16,7 +16,7 @@
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
 from OCC.Core.TDocStd import TDocStd_Document
-from OCC.Core.TCollection import TCollection_ExtendedString, TCollection_AsciiString
+from OCC.Core.TCollection import TCollection_AsciiString
 from OCC.Core.XCAFDoc import (
     XCAFDoc_DocumentTool_ShapeTool,
     XCAFDoc_DocumentTool_LayerTool,
@@ -34,7 +34,7 @@
 shp = BRepPrimAPI_MakeSphere(60.0).Shape()
 
 # create a document
-doc = TDocStd_Document(TCollection_ExtendedString("pythonocc-doc"))
+doc = TDocStd_Document("pythonocc-doc")
 shape_tool = XCAFDoc_DocumentTool_ShapeTool(doc.Main())
 layer_tool = XCAFDoc_DocumentTool_LayerTool(doc.Main())
 
@@ -60,7 +60,7 @@
 # Binary export
 #
 binary = True
-binary_rwgltf_writer = RWGltf_CafWriter(TCollection_AsciiString("box.glb"), binary)
+binary_rwgltf_writer = RWGltf_CafWriter("box.glb", binary)
 binary_rwgltf_writer.SetTransformationFormat(a_format)
 binary_rwgltf_writer.SetForcedUVExport(force_uv_export)
 pr = Message_ProgressRange()  # this is required
@@ -70,7 +70,7 @@
 # Ascii export
 #
 binary = False
-ascii_rwgltf_writer = RWGltf_CafWriter(TCollection_AsciiString("box.gla"), binary)
+ascii_rwgltf_writer = RWGltf_CafWriter("box.gla", binary)
 ascii_rwgltf_writer.SetTransformationFormat(a_format)
 ascii_rwgltf_writer.SetForcedUVExport(force_uv_export)
 pr = Message_ProgressRange()  # this is required

examples/core_export_ply_single_shape.py

@@ -34,7 +34,7 @@
 shp = BRepPrimAPI_MakeSphere(60.0).Shape()
 
 # create a document
-doc = TDocStd_Document(TCollection_ExtendedString("pythonocc-doc"))
+doc = TDocStd_Document("pythonocc-doc")
 shape_tool = XCAFDoc_DocumentTool_ShapeTool(doc.Main())
 layer_tool = XCAFDoc_DocumentTool_LayerTool(doc.Main())
 
@@ -53,6 +53,6 @@
     TCollection_AsciiString("Authors"), TCollection_AsciiString("pythonocc")
 )
 
-rwply_writer = RWPly_CafWriter(TCollection_AsciiString("sphere.ply"))
+rwply_writer = RWPly_CafWriter("sphere.ply")
 pr = Message_ProgressRange()
 rwply_writer.Perform(doc, a_file_info, pr)

examples/core_load_step_ap203_ocaf.py

@@ -15,11 +15,6 @@
 ##You should have received a copy of the GNU Lesser General Public License
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
-
-from OCC.Core.TCollection import TCollection_ExtendedString
-
 from OCC.Core.TDocStd import TDocStd_Document
 from OCC.Core.XCAFDoc import (
     XCAFDoc_DocumentTool_ShapeTool,
@@ -37,7 +32,7 @@
 _shapes = []
 
 # create an handle to a document
-doc = TDocStd_Document(TCollection_ExtendedString("pythonocc-doc"))
+doc = TDocStd_Document("pythonocc-doc")
 
 # Get root assembly
 shape_tool = XCAFDoc_DocumentTool_ShapeTool(doc.Main())

examples/core_load_step_ap214_with_materials.py

@@ -0,0 +1,59 @@
+##Copyright 2023 Thomas Paviot (tpaviot@gmail.com)
+##
+##This file is part of pythonOCC.
+##
+##pythonOCC 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 3 of the License, or
+##(at your option) any later version.
+##
+##pythonOCC 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 pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
+
+from OCC.Core.TDocStd import TDocStd_Document
+from OCC.Core.XCAFDoc import (
+    XCAFDoc_DocumentTool_MaterialTool,
+)
+from OCC.Core.STEPCAFControl import STEPCAFControl_Reader
+from OCC.Core.IFSelect import IFSelect_RetDone
+from OCC.Core.TDF import TDF_LabelSequence
+
+filename = "../assets/models/eight_cyl.stp"
+
+# create an handle to a document
+doc = TDocStd_Document("pythonocc-doc")
+
+# Get root assembly
+mat_tool = XCAFDoc_DocumentTool_MaterialTool(doc.Main())
+
+step_reader = STEPCAFControl_Reader()
+
+status = step_reader.ReadFile(filename)
+if status == IFSelect_RetDone:
+    step_reader.Transfer(doc)
+
+material_labels = TDF_LabelSequence()
+
+mat_tool.GetMaterialLabels(material_labels)
+
+# materials
+for i in range(1, material_labels.Length() + 1):
+    (
+        ok,
+        material_name,
+        material_description,
+        material_density,
+        material_densname,
+        material_densvaltype,
+    ) = mat_tool.GetMaterial(material_labels.Value(i))
+
+    print(f"Material name: {material_name}")
+    print(f"Material description: {material_description}")
+    print(f"Material density: {material_density}")
+    print(f"Material densname: {material_densname}")
+    print(f"Material_densvaltype: {material_densvaltype}\n")

examples/core_visualization_glsl.py

@@ -24,7 +24,6 @@
     Graphic3d_TOS_FRAGMENT,
     Graphic3d_ShaderObject,
 )
-from OCC.Core.TCollection import TCollection_AsciiString
 from OCC.Display.SimpleGui import init_display
 
 display, start_display, add_menu, add_function_to_menu = init_display()
@@ -50,12 +49,8 @@
 """
 
 # construct the shader, load, compile and attach the GLSL programs
-vs_shader = Graphic3d_ShaderObject.CreateFromSource(
-    Graphic3d_TOS_VERTEX, TCollection_AsciiString(vs)
-)
-fs_shader = Graphic3d_ShaderObject.CreateFromSource(
-    Graphic3d_TOS_FRAGMENT, TCollection_AsciiString(fs)
-)
+vs_shader = Graphic3d_ShaderObject.CreateFromSource(Graphic3d_TOS_VERTEX, vs)
+fs_shader = Graphic3d_ShaderObject.CreateFromSource(Graphic3d_TOS_FRAGMENT, fs)
 aProgram = Graphic3d_ShaderProgram()
 aProgram.AttachShader(fs_shader)
 aProgram.AttachShader(vs_shader)