Merge remote-tracking branch 'origin/master' into pr-typehint-example-how-to-fix-definition

Author: damienmarchal

bindings/Sofa/tests/Core/BaseData.py

@@ -248,6 +248,8 @@ def t(c):
         self.assertRaises(ValueError, (lambda c: t(c)), color)
 
     def test_DataAsContainerNumpyArray_testIsDirtyOnDoubleAccess_(self):
+        SofaRuntime.importPlugin("Sofa.Component.Topology.Container.Dynamic")
+        
         root = create_scene("rootNode")
 
         root.addObject("PointSetTopologyContainer", points=[[0, 0, 0], [1, 0, 0]])

bindings/Sofa/tests/Core/BaseMeshTopology.py

@@ -57,6 +57,8 @@ def test_regular_grid_hexas(self):
 
     def test_regular_grid_tetra(self):
         SofaRuntime.importPlugin("Sofa.Component.Topology.Container.Grid")
+        SofaRuntime.importPlugin("Sofa.Component.Topology.Container.Constant")
+        SofaRuntime.importPlugin("Sofa.Component.Topology.Container.Dynamic")
         SofaRuntime.importPlugin("Sofa.Component.Topology.Mapping")
 
         root = Sofa.Core.Node("rootNode")

bindings/Sofa/tests/Core/BaseObject.py

@@ -6,6 +6,7 @@
 def create_scene(rootName="root"):
     root = Sofa.Core.Node(rootName)
     root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
+    root.addObject("RequiredPlugin", name="Sofa.Component.Topology.Container.Constant")
     return root
 
 class Test(unittest.TestCase):

bindings/Sofa/tests/Core/Mass.py

@@ -22,6 +22,7 @@ def simulate_beam(linear_solver_template):
         root.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
         root.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
         root.addObject('RequiredPlugin', name='Sofa.Component.Mass')
+        root.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Grid')
 
         root.addObject('EulerImplicitSolver', rayleighStiffness="0.1", rayleighMass="0.1")
         root.addObject('SparseLDLSolver', applyPermutation="false", template=linear_solver_template)

bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp

@@ -22,17 +22,18 @@
 #include <functional>
 #include <pybind11/operators.h>
 #include <sstream>
-using sofa::type::Vec;
 
-#define BINDING_VEC_MAKE_NAME(N, T)                                            \
-    std::string(std::string("Vec") + std::to_string(N) + typeid(T).name())
+#include <sofa/defaulttype/typeinfo/TypeInfo_Vec.h>
+
+using sofa::type::Vec;
 
-namespace pyVec {
+namespace pyVec 
+{
 template <sofa::Size N, class T> std::string __str__(const Vec<N, T> &v, bool repr)
 {
     std::stringstream s ;
     s.imbue(std::locale("C"));
-    s << ((repr) ? (BINDING_VEC_MAKE_NAME(N, T) + "(") : ("("));
+    s << ((repr) ? (sofa::defaulttype::DataTypeInfo< Vec<N, T> >::name() + "(") : ("("));
     s << v[0];
     for (size_t i = 1; i < v.size(); ++i)
         s <<  ", " << v[i];
@@ -86,7 +87,7 @@ template <sofa::Size N, class T>
 py::class_<Vec<N,T>> addVec(py::module &m)
 {
     typedef Vec<N, T> VecClass;
-    py::class_<Vec<N, T>> p(m, BINDING_VEC_MAKE_NAME(N, T).c_str());
+    py::class_<Vec<N, T>> p(m, sofa::defaulttype::DataTypeInfo< Vec<N, T> >::name().c_str());
 
     p.def(py::init<>());                 // empty ctor
     p.def(py::init<const VecClass &>()); // copy ctor