[SofaPython3] Replace Prefab by RawPrefab and implement Sofa.Prefab

damienmarchal · damienmarchal · commit 73fa41a3048d · 2019-10-24T00:51:54.000+02:00
Now it is much better to inherit from Sofa.Prefab. This class
will do some boilerplate code.
diff --git a/bindings/Sofa/package/__init__.py b/bindings/Sofa/package/__init__.py
@@ -33,6 +33,7 @@
 import functools
 import traceback
 import Sofa.Helper
+import Sofa.Core
 import importlib
 
 __all__=["animation"]
@@ -158,12 +159,27 @@ def pyType2sofaType(v):
         return "double"
     return None
 
-def getPrefabProperties(f):
-    frameinfo = inspect.getframeinfo(inspect.currentframe().f_back.f_back)
-    definedloc = (frameinfo.filename, frameinfo.lineno)
 
-    print("DEFINED LOC ", definedloc, f.__code__.co_name, f.__doc__)
-    return (definedloc[0], definedloc[1])
+class Prefab(Sofa.Core.RawPrefab):
+    def __init__(self):
+        Sofa.Core.RawPrefab.__init__(self)
+        frame = inspect.currentframe().f_back
+        frameinfo = inspect.getframeinfo(frame)
+        definedloc = (frameinfo.filename, frameinfo.lineno)
+
+        self.setDefinitionSourceFileName(definedloc[0])
+        self.setDefinitionSourceFilePos(definedloc[1])
+
+        frame = frame.f_back
+        if frame is not None:
+            frameinfo = inspect.getframeinfo(frame)
+            definedloc = (frameinfo.filename, frameinfo.lineno)
+            self.setInstanciationSourceFileName(definedloc[0])
+            self.setInstanciationSourceFilePos(definedloc[1])
+
+        self.addData("prefabname", value=type(self).__name__, type="string", group="Infos", help="Name of the prefab")
+        self.addData("docstring", value=self.__doc__, type="string", group="Infos", help="Name of the prefab")
+
 
 def PrefabBuilder(f):
         frameinfo = inspect.getframeinfo(inspect.currentframe().f_back)
@@ -180,9 +196,9 @@ def addChild(self, name):
                     def __getattr__(self, name):
                         return getattr(self.node, name)
 
-            class InnerSofaPrefab(Sofa.Core.Prefab):
+            class InnerSofaPrefab(Sofa.Core.RawPrefab):
                 def __init__(self, name):
-                    Sofa.Core.Prefab.__init__(self, name=name)
+                    Sofa.Core.RawPrefab.__init__(self, name=name)
 
                 def doReInit(self):
                     argnames = inspect.getfullargspec(f).args
@@ -193,7 +209,8 @@ def doReInit(self):
                         kkwargs[name] = self.__data__[name].value
                     f(**kkwargs)
 
-            selfnode = InnerSofaPrefab(name="InnerSofaP")
+
+            selfnode = InnerSofaPrefab(name=f.__code__.co_name)
             selfnode.setDefinitionSourceFileName(definedloc[0])
             selfnode.setDefinitionSourceFilePos(definedloc[1])
 
@@ -212,7 +229,8 @@ def doReInit(self):
                 if argnames[i+n] not in selfnode.__data__:
                     selfnode.addPrefabParameter(name=argnames[i+n], value=defaults[n], type=pyType2sofaType(defaults[n]), help="Undefined")
 
-            selfnode.init()
+
+                selfnode.init()
             return selfnode
         return SofaPrefabF
 
diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp
@@ -105,7 +105,7 @@ namespace sofapython3
         py::class_<Prefab,
                 Prefab_Trampoline,
                 BasePrefab,
-                py_shared_ptr<Prefab>> f(m, "Prefab",
+                py_shared_ptr<Prefab>> f(m, "RawPrefab",
                                          py::dynamic_attr(),
                                          py::multiple_inheritance(),
                                          sofapython3::doc::prefab::Prefab);
@@ -114,18 +114,6 @@ namespace sofapython3
         {
                   auto c = new Prefab_Trampoline();
 
-//                  py::dict globals = py::module::import("__main__").attr("__dict__");
-//                  py::dict locals {"f"_a=PythonFactory::toPython(c)};
-//                  py::object res = py::eval<py::eval_statements>(            // tell eval we're passing multiple statements
-//                        "import Sofa\n"
-//                        "Sofa.getPrefabProperties(f)\n", globals, locals);
-
-//                  py::print(py::str(res));
-
-//                  c->addD
-//                  c->setDefinitionSourceFilePos();
-//                  c->setDefinitionSourceFileName();
-
                   for(auto kv : kwargs)
                   {
                       std::string key = py::cast<std::string>(kv.first);
diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp
@@ -73,7 +73,7 @@ PYBIND11_MODULE(Core, core)
                Sofa.Core.Data
                Sofa.Core.Link
                Sofa.Core.Node
-               Sofa.Core.Prefab
+               Sofa.Core.RawPrefab
                Sofa.Core.Object
                Sofa.Core.Camera
 
