Merge branch 'master' into add_addLink

Author: marques-bruno

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

@@ -25,7 +25,6 @@ along with sofaqtquick. If not, see <http://www.gnu.org/licenses/>.
     - [email protected]
 ********************************************************************/
 
-
 #include <pybind11/pybind11.h>
 
 #include <pybind11/numpy.h>
@@ -405,6 +404,19 @@ std::string BindingBase::getPathName(Base& self)
 {
     return self.toBaseNode() ? self.toBaseNode()->getPathName() : self.toBaseObject()->getPathName();
 }
+    
+py::object BindingBase::setDataValues(Base& self, py::kwargs kwargs)
+{
+    for(auto key : kwargs)
+    {
+        BaseData* d = self.findData(py::cast<std::string>(key.first));
+        if(d!=nullptr)
+            PythonFactory::fromPython(d, py::cast<py::object>(key.second));
+        else
+            throw py::attribute_error("There is no data field named: "+py::cast<std::string>(key.first));
+    }
+    return py::none();
+}
 
 void moduleAddBase(py::module &m)
 {
@@ -441,6 +453,7 @@ void moduleAddBase(py::module &m)
     base.def("countLoggedMessages", &BindingBase::countLoggedMessages, sofapython3::doc::base::countLoggedMessages);
     base.def("clearLoggedMessages", &BindingBase::clearLoggedMessages, sofapython3::doc::base::clearLoggedMessages);
     base.def("getPathName", &BindingBase::getPathName);
+    base.def("setDataValues", &BindingBase::setDataValues, sofapython3::doc::base::setDataValues);
 }
 
 } /// namespace sofapython3

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h

@@ -66,6 +66,7 @@ class BindingBase
     /// Set the data field value from the array.
     static void SetDataFromArray(BaseData* data, const py::array& value);
     static bool SetData(BaseData* data, pybind11::object value);
+    static py::object setDataValues(Base& self, py::kwargs kwargs);
 
     static py::list getDataFields(Base& self);
     static py::list getLinks(Base& self);

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base_doc.h

@@ -70,6 +70,10 @@ static auto findData =
         :type name: string
         :return: the data field
         )";
+static auto setDataValues =
+        R"(
+        Set values for a the given data field, multiple pairs of args are allowed.
+        )";
 static auto getDataFields =
         R"(
         Accessor to the vector containing all the fields of this object

bindings/Sofa/src/SofaPython3/Sofa/Simulation/CMakeLists.txt

@@ -18,5 +18,5 @@ SP3_add_python_module(
         MODULE_NAME  Simulation
         SOURCES      ${SOURCE_FILES}
         HEADERS      ${HEADER_FILES}
-        DEPENDS      SofaHelper SofaCore SofaSimulationCore SofaSimulationGraph SofaBaseVisual
+        DEPENDS      SofaCore SofaSimulationCore SofaSimulationGraph SofaBaseVisual
 )

bindings/Sofa/tests/CMakeLists.txt

@@ -25,6 +25,7 @@ set(PYTHON_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/Types/Vec3.py
     ${CMAKE_CURRENT_SOURCE_DIR}/Types/BoundingBox.py
     ${CMAKE_CURRENT_SOURCE_DIR}/Simulation/Node.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/Simulation/Simulation.py
     ${CMAKE_CURRENT_SOURCE_DIR}/bench_datacontainer.py
     ${CMAKE_CURRENT_SOURCE_DIR}/bench_node.py
     ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.py

bindings/Sofa/tests/Simulation/Simulation.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*
+import Sofa
+import unittest
+import Sofa.Core
+import Sofa.Types
+import Sofa.Simulation
+import tempfile
+
+class Test(unittest.TestCase):
+    def test_load(self):
+        """Create a scene and load it to validate the loading function"""
+        scene="""
+            <Node name="rootNode" dt="0.005" gravity="0 0 0">
+                <Node name="child1">
+                </Node>
+                <Node name="child2">
+                </Node>
+            </Node>
+        """
+        tf = tempfile.NamedTemporaryFile(mode="w+t", suffix=".scn")
+        tf.file.write(scene)
+        tf.file.flush()
+        tt = open(tf.name)
+        node = Sofa.Simulation.load(tf.name)
+        self.assertNotEqual(node, None)
+        self.assertEqual(node.name.value, "rootNode")
+