OCP 7.9 multiple fixes and QoL improvements (#194)

* OCP 7.9 multiple fixes and QoL improvements

* Add cast_pyobject

* Add overloads with explicit converters

* Make strings implicitly convertible

* TCollection conf fix

Removed duplicate include_body_post and added new implicit conversions.

* Add fmt to deps

* Link against fmt

* Switch to fmt

* typo fix

* Another typo

* typo fix

* Correct cast_pyobject return type

* Simplify iostram casters

* Add RWMesh

* Extra include for RWMesh

* Update version to 7.9.3.1

Author: adam-urbanczyk

OCP_specific.inc

@@ -2,6 +2,7 @@
 #include <Standard_Handle.hxx>
 #include <type_traits>
 #include <memory>
+#include <fmt/format.h>
 
 namespace py = pybind11;
 
@@ -46,6 +47,13 @@ inline void copy_if_copy_constructible(T& t1, T& t2){
 
 };
 
+template <typename T> inline opencascade::handle<T> cast_pyobject(const py::object &arg){
+  if(py::isinstance(arg, py::type::of<T>()))
+      return opencascade::handle(py::cast<T*>(arg));
+  else
+      throw py::value_error(fmt::format("Cannot convert the argument to the required type {}", typeid(T).name()));
+};
+
 template<typename T, template<typename> typename Deleter = std::default_delete>
 struct shared_ptr : public std::shared_ptr<T>{
     explicit shared_ptr(T* t = nullptr) : std::shared_ptr<T>(t, Deleter<T>()) {};

environment.devenv.yml

@@ -26,6 +26,7 @@ dependencies:
   {% else %}
   - cxx-compiler
   - tbb-devel # [win]
+  - fmt
   - pip:
       - git+https://github.com/CadQuery/pybind11-stubgen.git
   {% endif %}

ocp.toml

@@ -30,7 +30,6 @@ modules = [
 "Quantity",
 "Storage",
 "FSD",
-"MMgt",
 "TCollection",
 "TColStd",
 "Message",
@@ -269,6 +268,7 @@ modules = [
 "RWStepGeom",
 "RWStepRepr",
 "RWStepShape",
+"RWMesh",
 "StepBasic",
 "StepGeom",
 "StepRepr",
@@ -424,7 +424,7 @@ class Adaptor3d_Surface;
 
 [Attributes]
 
-    __version__ = "7.9.3.0"
+    __version__ = "7.9.3.1"
 
 [Modules]
 
@@ -493,6 +493,20 @@ void register_template_NCollection_Vector(py::object &m, const char *name){
     [Modules.TCollection]
 
         exclude_methods = ["TCollection_ExtendedString::ToUTF8CString"]
+        include_body_post = """py::implicitly_convertible<std::string, TCollection_HAsciiString>();
+py::implicitly_convertible<std::string, TCollection_AsciiString>();"""
+
+        [[Modules.TCollection.Classes.TCollection_HAsciiString.additional_constructors]]
+
+            body = "[](const std::string &s){ return TCollection_HAsciiString(s.c_str()); }"
+            help = "std::strings based constructor"
+            arguments  = ["aString"]
+
+        [[Modules.TCollection.Classes.TCollection_AsciiString.additional_constructors]]
+
+            body = "[](const std::string &s){ return TCollection_AsciiString(s.c_str()); }"
+            help = "std::strings based constructor"
+            arguments  = ["aString"]
 
     [Modules.TColStd]
 
@@ -1090,6 +1104,12 @@ struct __GLXFBConfigRec {};"""
 
         exclude_classes = ["StepData_EnumTool"]
 
+        [Modules.StepData.Classes.StepData_SelectType.additional_methods.SetValue]
+
+            body = "[](StepData_SelectType &self , py::object& ent){self.SetValue(cast_pyobject<Standard_Transient>(ent));}"
+            help = "SetValue supporting python objects"
+            arguments  = ["ent"]
+
     [Modules.LDOM]
 
         exclude_classes = ["LDOMString","LDOM_MemManager","LDOM_BasicText"]
@@ -1279,6 +1299,18 @@ using rapidjson::BasicOStreamWrapper;"""
 
             "Interface_ValueInterpret.hxx" = "#include <Interface_TypedValue.hxx>"
 
+        [Modules.Interface.Classes.Interface_InterfaceModel.additional_methods.AddEntity]
+
+            body = "[](Interface_InterfaceModel &self , py::object& ent){self.AddEntity(cast_pyobject<Standard_Transient>(ent));}"
+            help = "AddEntity supporting python objects"
+            arguments  = ["anent"]
+
+        [Modules.Interface.Classes.Interface_InterfaceModel.additional_methods.AddWithRefs]
+
+            body = "[](Interface_InterfaceModel &self , py::object& ent){self.AddWithRefs(cast_pyobject<Standard_Transient>(ent));}"
+            help = "AddWithRefs supporting python objects"
+            arguments  = ["anent"]
+
     [Modules.IVtkVTK]
 
         include_header_pre = """#include <vtkRenderer.h>
@@ -1495,3 +1527,7 @@ using rapidjson::BasicOStreamWrapper;"""
     [Modules.StepAP214]
 
         include_header_pre = "#include <Interface_InterfaceModel.hxx>"
+
+    [Modules.RWMesh]
+
+        include_header_pre = "#include <OSD_FileSystem.hxx>"