Merge branch 'master' into pr-remove-dagnode

Author: damienmarchal

Plugin/CMakeLists.txt

@@ -71,5 +71,5 @@ sofa_create_component_in_package_with_targets(
     INCLUDE_SOURCE_DIR "src"
     INCLUDE_INSTALL_DIR "."
     OPTIMIZE_BUILD_DIR FALSE
-    RELOCATABLE "../../plugins"
+    RELOCATABLE_PATH "../../plugins"
     )

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

@@ -173,6 +173,14 @@ py_shared_ptr<Node> __init__(const std::string& name) {
     return std::move(dag_node);
 }
 
+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);
+
+    setDataFromKwargs(dag_node.get(), kwargs);
+
+    return std::move(dag_node);
+}
+
 /// Method: init (beware this is not the python __init__, this is sofa's init())
 void init(Node& self) { self.init(sofa::core::execparams::defaultInstance()); }
 
@@ -680,7 +688,8 @@ void moduleAddNode(py::module &m) {
     });
 
     p.def(py::init(&__init__noname), sofapython3::doc::sofa::core::Node::init);
-    p.def(py::init(&__init__), sofapython3::doc::sofa::core::Node::init1Arg, py::arg("name"));
+    p.def(py::init(&__init__no_kwargs__), sofapython3::doc::sofa::core::Node::init1Arg, py::arg("name"));
+    p.def(py::init(&__init__), sofapython3::doc::sofa::core::Node::init1Arg);
     p.def("init", &init, sofapython3::doc::sofa::core::Node::initSofa );
     p.def("add", &addKwargs, sofapython3::doc::sofa::core::Node::addKwargs);
     p.def("addObject", &addObjectKwargs, sofapython3::doc::sofa::core::Node::addObjectKwargs);