Make a generic function out the code that set data from kwarg so tthis can be applid to all objects

Author: bakpaul

Plugin/src/SofaPython3/DataHelper.cpp

@@ -659,4 +659,28 @@ BaseLink* addLink(py::object py_self, const std::string& name, py::object value,
     return link;
 }
 
+
+void setDataFromKwargs(Base* obj, const pybind11::kwargs& kwargs)
+{
+    const auto typeHandleBaseData = py::detail::get_type_handle(typeid(BaseData), false);
+    const auto typeHandleLinkPath = py::detail::get_type_handle(typeid(LinkPath), false);
+
+    for (auto & kv : kwargs)
+    {
+        BaseData* d = obj->findData(py::cast<std::string>(kv.first));
+        if(d)
+        {
+            if (py::isinstance(kv.second, typeHandleBaseData))
+                d->setParent(kv.second.cast<BaseData*>());
+            else if (py::isinstance(kv.second, typeHandleLinkPath))
+                d->setParent(py::str(kv.second));
+            else if (py::isinstance<py::str>(kv.second))
+                d->read(py::str(kv.second));
+            else
+                PythonFactory::fromPython(d, py::cast<py::object>(kv.second));
+        }
+    }
+}
+
+
 }  // namespace sofapython3

Plugin/src/SofaPython3/DataHelper.h

@@ -32,6 +32,7 @@
 #include <sofa/core/objectmodel/BaseNode.h>
 #include <SofaPython3/config.h>
 
+
 ////////////////////////// FORWARD DECLARATION ///////////////////////////
 namespace sofa {
     namespace defaulttype {
@@ -292,6 +293,9 @@ SOFAPYTHON3_API BaseData* addData(pybind11::object py_self, const std::string& n
 SOFAPYTHON3_API BaseLink* addLink(pybind11::object py_self, const std::string& name, pybind11::object value, const std::string& help);
 SOFAPYTHON3_API bool isProtectedKeyword(const std::string& name);
 
+
+SOFAPYTHON3_API void setDataFromKwargs(Base* obj, const pybind11::kwargs& kwargs);
+
 }  // namespace sofapython3
 
 

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp

@@ -176,24 +176,7 @@ py_shared_ptr<Node> __init__no_kwargs__(const std::string& name) {
 py_shared_ptr<Node> __init__(const std::string& name, const py::kwargs& kwargs) {
     auto dag_node = sofa::core::objectmodel::New<sofa::simulation::graph::DAGNode>(name);
 
-    const auto typeHandleBaseData = py::detail::get_type_handle(typeid(BaseData), false);
-    const auto typeHandleLinkPath = py::detail::get_type_handle(typeid(LinkPath), false);
-
-    for (auto & kv : kwargs)
-    {
-        BaseData* d = dag_node->findData(py::cast<std::string>(kv.first));
-        if(d)
-        {
-            if (py::isinstance(kv.second, typeHandleBaseData))
-                d->setParent(kv.second.cast<BaseData*>());
-            else if (py::isinstance(kv.second, typeHandleLinkPath))
-                d->setParent(py::str(kv.second));
-            else if (py::isinstance<py::str>(kv.second))
-                d->read(py::str(kv.second));
-            else
-                PythonFactory::fromPython(d, py::cast<py::object>(kv.second));
-        }
-    }
+    setDataFromKwargs(dag_node.get(), kwargs);
 
     return std::move(dag_node);
 }