ADD: getPathName() method in Base, and return Sofa.Core.Link instead of the target with getattr

Author: marques-bruno

Plugin/src/SofaPython3/DataHelper.cpp

@@ -618,7 +618,7 @@ BaseLink* addLink(py::object py_self, const std::string& name, py::object value,
         if (!link->read(linkpath))
             throw py::value_error("addLink: Cannot read link path " + linkpath + ": is link valid?");
     }
-    else
+    else if (py::isinstance<Base*>(value))
         link->setLinkedBase(py::cast<Base*>(value));
 
 //    self->addLink(link);

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

@@ -94,7 +94,7 @@ py::object BindingBase::GetAttr(Base* self, const std::string& s, bool doThrowEx
     /// Search if there is a link with the given name.
     /// If this is the case returns the corresponding python type.
     if(BaseLink* l = self->findLink(s))
-        return py::cast(l->getLinkedBase());
+        return py::cast(l);
 
     /// Search if we are quering for a 'magic' and private __data__ property
     /// this one allows to traverse all the data in the object
@@ -400,6 +400,12 @@ py::object BindingBase::getData(Base& self, const std::string& s)
     return py::none();
 }
 
+
+std::string BindingBase::getPathName(Base& self)
+{
+    return self.toBaseNode() ? self.toBaseNode()->getPathName() : self.toBaseObject()->getPathName();
+}
+
 void moduleAddBase(py::module &m)
 {
     py::class_<Base, Base::SPtr> base(m, "Base", py::dynamic_attr(), doc::base::BaseClass);
@@ -425,7 +431,7 @@ void moduleAddBase(py::module &m)
     base.def("getLinks", &BindingBase::getLinks, pybind11::return_value_policy::reference, sofapython3::doc::base::getLinks);
     base.def("addData", &BindingBase::addData, "name"_a, "value"_a = py::none(), "default"_a = py::none(), "help"_a = "", "group"_a = "", "type"_a = "", sofapython3::doc::base::addData);
     base.def("addData", &BindingBase::addDataFromData, sofapython3::doc::base::addDataInitialized);
-    base.def("addLink", &BindingBase::addLink, "name"_a, "value"_a, "help"_a = "", sofapython3::doc::base::addLink);
+    base.def("addLink", &BindingBase::addLink, "name"_a, "value"_a = py::none(), "help"_a = "", sofapython3::doc::base::addLink);
     base.def("__getattr__", &BindingBase::__getattr__);
     base.def("__setattr__", &BindingBase::__setattr__);
     base.def("getData", &BindingBase::getData, sofapython3::doc::base::getData);
@@ -434,6 +440,7 @@ void moduleAddBase(py::module &m)
     base.def("getLoggedMessagesAsString", &BindingBase::getLoggedMessagesAsString, sofapython3::doc::base::getLoggedMessagesAsString);
     base.def("countLoggedMessages", &BindingBase::countLoggedMessages, sofapython3::doc::base::countLoggedMessages);
     base.def("clearLoggedMessages", &BindingBase::clearLoggedMessages, sofapython3::doc::base::clearLoggedMessages);
+    base.def("getPathName", &BindingBase::getPathName);
 }
 
 } /// namespace sofapython3

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

@@ -80,6 +80,7 @@ class BindingBase
     static py::object getLoggedMessagesAsString(Base& self);
     static py::object countLoggedMessages(Base& self);
     static py::object clearLoggedMessages(Base& self);
+    static std::string getPathName(Base& self);
 };
 
 

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

@@ -65,6 +65,13 @@ py::object getOwnerBase(BaseLink& self)
     return PythonFactory::toPython(self.getOwnerBase());
 }
 
+std::string getPathName(BaseLink& self)
+{
+    auto n = self.getOwnerBase()->toBaseNode();
+    auto o = self.getOwnerBase()->toBaseObject();
+    return (n ? n->getPathName() : o->getPathName()) + "." + self.getName();
+}
+
 void moduleAddBaseLink(py::module& m)
 {
     py::class_<BaseLink, std::unique_ptr<sofa::core::objectmodel::BaseLink, pybind11::nodelete>> link(m, "Link", sofapython3::doc::baseLink::baseLinkClass);
@@ -91,6 +98,7 @@ void moduleAddBaseLink(py::module& m)
 
 
     link.def("getLinkedPath", &BaseLink::getLinkedPath, "index"_a = 0, sofapython3::doc::baseLink::getLinkedPath);
+    link.def("getPathName", getPathName, sofapython3::doc::baseLink::getLinkedPath);
     link.def("read", &BaseLink::read, sofapython3::doc::baseLink::read);
 
 }