Fix Python wrappers

lamyj · Apr 13, 2017 · 027d506 · 027d506
1 parent 41bda87
commit 027d506
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/wrappers/GetSCP.cpp b/wrappers/GetSCP.cpp
@@ -55,7 +55,12 @@ void wrap_GetSCP()
 
     scope get_scp_scope = class_<GetSCP>("GetSCP", init<Association &>())
         .def("set_generator", &set_generator)
-        .def("__call__", &odil::GetSCP::operator())
+        .def(
+            "__call__",
+            static_cast<
+                void (GetSCP::*)(message::Message const &)
+            >(&GetSCP::operator())
+        )
     ;
 
     class_<DataSetGeneratorWrapperGet, boost::noncopyable>(

diff --git a/wrappers/StoreSCP.cpp b/wrappers/StoreSCP.cpp
@@ -38,7 +38,12 @@ void wrap_StoreSCP()
     class_<StoreSCP>("StoreSCP", init<Association&>())
     .def(init<Association&, StoreSCP::Callback& >())
     .def("set_callback", &set_callback)
-    .def("__call__", &StoreSCP::operator())
+    .def(
+        "__call__",
+        static_cast<
+            void (StoreSCP::*)(message::Message const &)
+        >(&StoreSCP::operator())
+    )
     ;
 
 }
diff --git a/wrappers/StoreSCU.cpp b/wrappers/StoreSCU.cpp
@@ -10,13 +10,18 @@
 
 #include "odil/StoreSCU.h"
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(storeMethod, odil::StoreSCU::store, 1, 3)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(
+    store_overloads, odil::StoreSCU::store, 1, 3)
 
 void wrap_StoreSCU()
 {
     using namespace boost::python;
     using namespace odil;
 
+    typedef
+        void (StoreSCU::*StoreFunction)(
+            DataSet const &, Value::String const &, Value::Integer) const;
+
     class_<StoreSCU>("StoreSCU", init<Association &>())
         .def(
             "get_affected_sop_class",
@@ -28,9 +33,8 @@ void wrap_StoreSCU()
             static_cast<void(StoreSCU::*)(DataSet const &)>(&StoreSCU::set_affected_sop_class)
         )
         .def(
-            "store", 
-            &StoreSCU::store,
-            storeMethod()
-        )
+            "store",
+            static_cast<StoreFunction>(&odil::StoreSCU::store),
+            store_overloads())
     ;
 }