cleanup Prefab code

Author: marques-bruno

Plugin/src/SofaPython3/Prefab.cpp

@@ -78,31 +78,15 @@ Prefab::~Prefab()
 }
 
 
-void Prefab::addDataParameter(const std::string& name, py::object value, const std::string& help, std::string type)
+void Prefab::addPrefabParameter(const std::string& name, const std::string& help, const std::string& type, py::object defaultValue)
 {
     if(!findData(name) && !findLink(name))
     {
-        sofa::core::objectmodel::BaseData* data = sofapython3::addData(py::cast(this), name, value, py::object(), help, "Prefab's properties", type);
+        sofa::core::objectmodel::BaseData* data = sofapython3::addData(py::cast(this), name, py::none(), defaultValue, help, "Prefab's properties", type);
         m_datacallback.addInputs({data});
-        return;
     }
-    //PythonFactory::fromPython(data, value);
 }
 
-void Prefab::addLinkParameter(const std::string& name, const std::string& help)
-{
-    if(!findData(name) && !findLink(name))
-    {
-        sofa::core::objectmodel::BaseData* data = sofapython3::addData(py::cast(this), name, py::none(), py::none(), help, "Prefab's properties", "PrefabLink");
-        std::cout << data->getName() << " Successfully created!" << std::endl;
-        m_datacallback.addInputs({data});
-        return;
-    }
-    std::cout << name << " Already exist in " << this->getName() << "!!!" << std::endl;
-    //PythonFactory::fromPython(data, value);
-}
-
-
 void Prefab::setSourceTracking(const std::string& filename)
 {
     std::cout << "Activating source tracking to " << filename << std::endl;

Plugin/src/SofaPython3/Prefab.h

@@ -39,8 +39,7 @@ class SOFAPYTHON3_API Prefab : public BasePrefab
     void reinit();
     virtual void doReInit() ;
 
-    void addDataParameter(const std::string& name, pybind11::object value, const std::string& help, std::string type);
-    void addLinkParameter(const std::string& name, const std::string& help);
+    void addPrefabParameter(const std::string& name, const std::string& help, const std::string& type, pybind11::object defaultValue = py::none());
     void setSourceTracking(const std::string& filename);
     void breakPrefab();
 

Plugin/src/SofaPython3/PythonFactory.cpp

@@ -439,6 +439,7 @@ bool PythonFactory::registerDefaultTypes()
 
     // PrefabLink
     PythonFactory::registerType<sofa::core::objectmodel::PrefabLink>("PrefabLink");
+    PythonFactory::registerType<sofa::core::objectmodel::PrefabLink>("Link");
 
     // Scalars
     PythonFactory::registerType<std::string>("string");

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

@@ -98,8 +98,6 @@ void moduleAddPrefab(py::module &m) {
                   std::string key = py::cast<std::string>(kv.first);
                   py::object value = py::reinterpret_borrow<py::object>(kv.second);
 
-                  std::cout << "PREFAB ARE BROKEN " << key << std::endl;
-
                   if( key == "name")
                       c->setName(py::cast<std::string>(kv.second));
                   try {
@@ -116,10 +114,8 @@ void moduleAddPrefab(py::module &m) {
           ));
 
     f.def("setSourceTracking", &Prefab::setSourceTracking);
-    f.def("addDataParameter", &Prefab::addDataParameter,
-          "name"_a, "value"_a, "help"_a, "type"_a);
-    f.def("addLinkParameter", &Prefab::addLinkParameter,
-          "name"_a, "help"_a);
+    f.def("addPrefabParameter", &Prefab::addPrefabParameter,
+          "name"_a, "help"_a, "type"_a, "default"_a = py::none());
     f.def("init", &Prefab::init);
     f.def("reinit", &Prefab::reinit);
 }