Skip to content

Remove the implementation of getPathName as it is now in Sofa.Core.BaseData #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove the implementation of getPathName as it is now in Sofa.Core.BaseData #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Plugin/src/SofaPython3/DataHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,7 @@ std::ostream& operator<<(std::ostream& out, const py::buffer_info& p)

std::string getPathTo(Base* b)
{
BaseNode* node = dynamic_cast<BaseNode*>(b);
if(node)
return node->getPathName();
BaseObject* object = dynamic_cast<BaseObject*>(b);
if(object)
return object->getPathName();

assert(true && "Only Base & BaseObject are supported");
return "";
return b->getPathName();
}

const char* getFormat(const AbstractTypeInfo& nfo)
Expand Down
16 changes: 2 additions & 14 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,6 @@ using sofa::defaulttype::AbstractTypeInfo;
namespace sofapython3
{

std::string getPathName(BaseData& self)
{
Base* b= self.getOwner();
std::string prefix = getPathTo(b);
return prefix+"."+self.getName();
}

std::string getLinkPath(BaseData& self)
{
return "@"+getPathName(self);
}

bool hasChanged(BaseData& data)
{
if (data.isDirty()) {
Expand Down Expand Up @@ -230,8 +218,8 @@ void moduleAddBaseData(py::module& m)
data.def("getOwner", &getOwner, sofapython3::doc::baseData::getOwner);
data.def("getParent", &BaseData::getParent, sofapython3::doc::baseData::getParent);
data.def("typeName", [](BaseData& data){ return data.getValueTypeInfo()->name(); }, sofapython3::doc::baseData::typeName);
data.def("getPathName", getPathName, sofapython3::doc::baseData::getPathName);
data.def("getLinkPath", getLinkPath, sofapython3::doc::baseData::getLinkPath);
data.def("getPathName", &BaseData::getPathName, sofapython3::doc::baseData::getPathName);
data.def("getLinkPath", &BaseData::getLinkPath, sofapython3::doc::baseData::getLinkPath);
data.def("hasChanged", hasChanged, sofapython3::doc::baseData::hasChanged);
data.def("isSet", isSet, sofapython3::doc::baseData::isSet);
data.def("toList", toList, sofapython3::doc::baseData::toList);
Expand Down
Loading