Skip to content

[SofaPython3] Add a per-keyword setData function #35

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

Merged
jnbrunet merged 1 commit into from
Jul 23, 2020
Merged

[SofaPython3] Add a per-keyword setData function #35

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
15 changes: 14 additions & 1 deletion bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ along with sofaqtquick. If not, see <http://www.gnu.org/licenses/>.
- thierry.gaugry@inria.fr
********************************************************************/


#include <pybind11/pybind11.h>

#include <pybind11/numpy.h>
Expand Down Expand Up @@ -395,6 +394,19 @@ py::object BindingBase::getData(Base& self, const std::string& s)
return py::none();
}

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)
{
py::class_<Base, Base::SPtr> base(m, "Base", py::dynamic_attr(), doc::base::BaseClass);
Expand Down Expand Up @@ -428,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("setDataValues", &BindingBase::setDataValues, sofapython3::doc::base::setDataValues);
}

} /// namespace sofapython3
1 change: 1 addition & 0 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,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);
Expand Down
4 changes: 4 additions & 0 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base_doc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down