Skip to content

[Bindings] Fix compilation #117

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 4 commits into from
Mar 6, 2021
Merged

[Bindings] Fix compilation #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84bb3c9
follow deletion of link functions
fredroy Mar 1, 2021
4154974
fix compilation for (future) pr
fredroy Mar 4, 2021
1e105c6
remove tests using deleted functions
fredroy Mar 4, 2021
18dca3e
fix again with the sofa master
fredroy Mar 4, 2021
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
1 change: 1 addition & 0 deletions Plugin/src/SofaPython3/PythonTestExtractor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <SofaPython3/PythonTestExtractor.h>
#include <SofaPython3/PythonEnvironment.h>

#include <sofa/helper/logging/Messaging.h>
#include <sofa/helper/system/FileSystem.h>
#include <sofa/helper/StringUtils.h>
#include <sofa/helper/system/SetDirectory.h>
Expand Down
1 change: 1 addition & 0 deletions bindings/Modules/tests/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <SofaPython3/PythonTestExtractor.h>
#include <sofa/helper/Utils.h>

#include <sofa/helper/logging/Messaging.h>
#include <sofa/core/logging/PerComponentLoggingMessageHandler.h>


Expand Down
2 changes: 0 additions & 2 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ void moduleAddBaseLink(py::module& m)
link.def("getHelp", &BaseLink::getHelp, sofapython3::doc::baseLink::getHelp);
link.def("setHelp", setHelp, sofapython3::doc::baseLink::setHelp);

link.def("getOwnerData", &BaseLink::getOwnerData, sofapython3::doc::baseLink::getOwnerData);
link.def("getOwnerBase", getOwnerBase, sofapython3::doc::baseLink::getOwnerBase);

link.def("getLinkedData", &BaseLink::getLinkedData, sofapython3::doc::baseLink::getLinkedData);
link.def("getLinkedBase", getLinkedBase, "index"_a = 0, sofapython3::doc::baseLink::getLinkedBase);
link.def("setLinkedBase", &BaseLink::setLinkedBase, sofapython3::doc::baseLink::getLinkedBase);

Expand Down
2 changes: 0 additions & 2 deletions bindings/Sofa/tests/Core/BaseLink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,8 @@ def test_getLinked_and_Owner(self):
mm = root.addObject("BarycentricMapping", input="@/t1", output="@/t2")
link_input = mm.findLink("input")
self.assertEqual(link_input.getLinkedBase(0).getName(),"t1")
self.assertEqual(link_input.getLinkedData(0), None)
link_output = mm.findLink("output")
self.assertEqual(link_output.getLinkedBase(0).getName(),"t2")
self.assertEqual(link_output.getLinkedData(0), None)
self.assertEqual(link_input.getOwnerBase().getName(), "BarycentricMapping")
self.assertEqual(link_output.getOwnerBase().getName(), "BarycentricMapping")

Expand Down
1 change: 1 addition & 0 deletions bindings/Sofa/tests/PythonModule_Sofa_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ using sofapython3::PythonTestExtractor ;
using sofapython3::PrintTo ;
using std::string;

#include <sofa/helper/logging/Messaging.h>
#include <sofa/core/logging/PerComponentLoggingMessageHandler.h>
using sofa::helper::logging::MessageDispatcher;
using sofa::helper::logging::MainPerComponentLoggingMessageHandler;
Expand Down
2 changes: 2 additions & 0 deletions bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ using sofa::helper::AdvancedTimer;

#include <stack>

#include <sofa/helper/logging/Messaging.h>

namespace sofapython3
{

Expand Down
1 change: 1 addition & 0 deletions bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ using sofapython3::PythonTestExtractor ;
using sofapython3::PrintTo ;
using std::string;

#include <sofa/helper/logging/Messaging.h>
#include <sofa/core/logging/PerComponentLoggingMessageHandler.h>
using sofa::helper::logging::MessageDispatcher;
using sofa::helper::logging::MainPerComponentLoggingMessageHandler;
Expand Down