X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=9704d6be2c37bcedef4cbcea73d659b51df52e37;hb=63b1baaa4ffc54e72247d80978c79456618281ce;hp=a1d6ea19ad4d633b7f23e1a76d7058b459ee0c8e;hpb=1eace7fe2d9708f674da4abe0461f4bb1d734c52;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index a1d6ea19..9704d6be 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -6,6 +6,10 @@
 #include "gdcmCommon.h"
 #include "gdcmBase.h"
 #include "gdcmRefCounter.h"
+#include "gdcmCommand.h"
+#include "gdcmCommandPy.h"
+#include "gdcmDebug.h"
+#include "gdcmCommandManager.h"
 #include "gdcmTagKey.h"
 #include "gdcmVRKey.h"
 #include "gdcmDict.h"
@@ -38,45 +42,6 @@
 #include "gdcmTS.h"
 #include "gdcmDictGroupName.h"
 
-////////////////////////////////////////////////////////////////////////////
-/// Refer (below) to the definition of multi-argument typemap
-///   %typemap(python, in)
-///      ( gdcm::DicomDir::Method*, void*, gdcm::DicomDir::Method*)
-/// for detail on gdcmPythonVoidFunc() and gdcmPythonVoidFuncArgDelete().
-void gdcmPythonVoidFunc(void *arg)
-{
-   PyObject *arglist, *result;
-   PyObject *func = (PyObject *)arg;
-
-   arglist = Py_BuildValue("()");
-
-   result = PyEval_CallObject(func, arglist);
-   Py_DECREF(arglist);
-
-   if (result)
-   {
-      Py_XDECREF(result);
-   }
-   else
-   {
-      if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt))
-      {
-         std::cerr << "Caught a Ctrl-C within python, exiting program.\n";
-         Py_Exit(1);
-      }
-      PyErr_Print();
-   }
-}
-
-void gdcmPythonVoidFuncArgDelete(void *arg)
-{
-   PyObject *func = (PyObject *)arg;
-   if (func)
-   {
-      Py_DECREF(func);
-   }
-}
-
 /// This is required in order to avoid %including all the gdcm include files.
 using namespace gdcm;
 %}
@@ -86,13 +51,13 @@ using namespace gdcm;
 
 ////////////////////////////////////////////////
 // Redefine all types used
-typedef char int8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-typedef int int32_t;
-typedef unsigned int uint32_t;
-typedef long long int64_t;
+typedef char               int8_t;
+typedef unsigned char      uint8_t;
+typedef short              int16_t;
+typedef unsigned short     uint16_t;
+typedef int                int32_t;
+typedef unsigned int       uint32_t;
+typedef long long          int64_t;
 typedef unsigned long long uint64_t;
 
 ////////////////////////////////////////////////
@@ -117,36 +82,6 @@ typedef unsigned long long uint64_t;
    $result = newEntry;
 }
 
-////////////////////////////////////////////////////////////////////////////
-// Multi-argument typemap designed for wrapping the progress related methods
-// in order to control from an external application the computation of
-// a DicomDir object (see DicomDir::SetStartMethod*,
-// DicomDir::SetProgressMethod* and DicomDir::SetEndMethod*).
-// Motivation: since DicomDir parsing can be quite long, a GUI application
-//             needs to display the avancement and potentially offer a
-//             cancel method to the user (when this one feels things are
-//             longer than expected).
-// Example of usage: refer to demo/DicomDirProgressMethod.py
-// Note: Uses gdcmPythonVoidFunc and gdcmPythonVoidFuncArgDelete defined
-//       in the Swig verbatim section of this gdcm.i i.e. in the above section
-//       enclosed within the %{ ... %} scope operator ).
-%typemap(python, in) (void(*method)(void *),void *arg,void(*argDelete)(void *))
-{
-	if($input!=Py_None)
-	{
-		Py_INCREF($input);
-		$1=gdcmPythonVoidFunc;
-		$2=$input;
-		$3=gdcmPythonVoidFuncArgDelete;
-	}
-	else
-	{
-		$1=NULL;
-		$2=NULL;
-		$3=NULL;
-	}
-}
-
 ////////////////////  STL string versus Python str  ////////////////////////
 // Convertion returning a C++ string.
 %typemap(out) std::string
@@ -219,6 +154,10 @@ typedef unsigned long long uint64_t;
 %ignore gdcm::DicomDir::SetProgressMethod(DicomDir::Method *method,void *arg = NULL);
 %ignore gdcm::DicomDir::SetEndMethod(DicomDir::Method *method,void *arg = NULL);
 
+%ignore gdcm::FileHelper::SetStartMethod(FileHelper::Method *method,void *arg = NULL);
+%ignore gdcm::FileHelper::SetProgressMethod(FileHelper::Method *method,void *arg = NULL);
+%ignore gdcm::FileHelper::SetEndMethod(FileHelper::Method *method,void *arg = NULL);
+
 // Ignore all placed in gdcmCommon.h
 %ignore GDCM_UNKNOWN;
 %ignore GDCM_UNFOUND;
@@ -244,6 +183,10 @@ typedef unsigned long long uint64_t;
 %include "gdcmCommon.h"
 %include "gdcmBase.h"
 %include "gdcmRefCounter.h"
+%include "gdcmCommand.h"
+%include "gdcmCommandPy.h"
+%include "gdcmDebug.h"
+%include "gdcmCommandManager.h"
 %include "gdcmTagKey.h"
 %include "gdcmVRKey.h"
 %include "gdcmDicomEntry.h"