X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=fb1a016a8db4570248a43f9ccfa27a08a4f69498;hb=8abf90fa1da49b5f7217029885a351d9420eef4d;hp=a7fa9553bb5f058b3b7094c35c384b5e1a2cc302;hpb=d91ddf43904e09830d43e580a7e21e511e22278f;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index a7fa9553..fb1a016a 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -1,4 +1,5 @@
 %module gdcm
+#pragma SWIG nowarn=504
 %{
 #include <iostream>
 
@@ -127,9 +128,7 @@ typedef unsigned long long uint64_t;
 // 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) ( gdcm::DicomDir::Method *, 
-                       void * = NULL, 
-                       gdcm::DicomDir::Method * = NULL )
+%typemap(python, in) (void(*method)(void *),void *arg,void(*argDelete)(void *))
 {
 	if($input!=Py_None)
 	{
@@ -204,8 +203,9 @@ typedef unsigned long long uint64_t;
 %ignore gdcm::binary_write(std::ostream &,uint32_t const &);
 %ignore gdcm::binary_write(std::ostream &,uint16_t const &);
 
-%ignore gdcm::File::File();
-%ignore gdcm::DicomDir::DicomDir();
+%ignore gdcm::DicomDir::SetStartMethod(DicomDir::Method *method,void *arg = NULL);
+%ignore gdcm::DicomDir::SetProgressMethod(DicomDir::Method *method,void *arg = NULL);
+%ignore gdcm::DicomDir::SetEndMethod(DicomDir::Method *method,void *arg = NULL);
 
 // Ignore all placed in gdcmCommon.h
 %ignore GDCM_UNKNOWN;
@@ -213,12 +213,14 @@ typedef unsigned long long uint64_t;
 %ignore GDCM_BINLOADED;
 %ignore GDCM_NOTLOADED;
 %ignore GDCM_UNREAD;
+%ignore GDCM_NOTASCII;
 
-%constant const char *UNKNOWN   = "gdcm::Unknown";
-%constant const char *UNFOUND   = "gdcm::Unfound";
-%constant const char *BINLOADED = "gdcm::Binary data loaded";
-%constant const char *NOTLOADED = "gdcm::NotLoaded";
-%constant const char *UNREAD    = "gdcm::UnRead";
+%constant const char *UNKNOWN       = "gdcm::Unknown";
+%constant const char *UNFOUND       = "gdcm::Unfound";
+%constant const char *BINLOADED     = "gdcm::Binary data loaded";
+%constant const char *NOTLOADED     = "gdcm::NotLoaded";
+%constant const char *UNREAD        = "gdcm::UnRead";
+%constant const char *GDCM_NOTASCII = "gdcm::NotAscii";
 
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !
@@ -240,7 +242,7 @@ typedef unsigned long long uint64_t;
 %include "gdcmDocument.h"
 %include "gdcmFile.h"
 %include "gdcmSerieHelper.h"
-%include "gdcmFile.h"
+%include "gdcmFileHelper.h"
 %include "gdcmUtil.h"
 %include "gdcmGlobal.h"
 %include "gdcmDicomDir.h"