X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=3a6dcfd3c8bd6c415d3d65fc6c88a32e58848da8;hb=4a98a8e8b103c5bbe8a3dcacbd78c6e651e0eb1c;hp=128f4db72f626b92f51bc62d7d3cd528aabfef43;hpb=5e749d7ae1b35e0f81e1278ba3a2bc12502e96ce;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 128f4db7..3a6dcfd3 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -1,4 +1,5 @@
 %module gdcm
+#pragma SWIG nowarn=504
 %{
 #include <iostream>
 
@@ -27,9 +28,7 @@
 #include "gdcmSQItem.h"
 #include "gdcmUtil.h"
 #include "gdcmDocEntry.h"
-#include "gdcmContentEntry.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
 #include "gdcmSeqEntry.h"
 #include "gdcmVR.h"
 #include "gdcmTS.h"
@@ -127,9 +126,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 +201,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 +211,19 @@ typedef unsigned long long uint64_t;
 %ignore GDCM_BINLOADED;
 %ignore GDCM_NOTLOADED;
 %ignore GDCM_UNREAD;
+%ignore GDCM_NOTASCII;
+%ignore GDCM_PIXELDATA;
+%ignore GDCM_LEGACY;
+%ignore GDCM_VRUNKNOWN;
 
-%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";
+%constant const char *GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded";
+%constant const char *VRUNKNOWN      = "  ";
 
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !
@@ -245,9 +250,7 @@ typedef unsigned long long uint64_t;
 %include "gdcmGlobal.h"
 %include "gdcmDicomDir.h"
 %include "gdcmDocEntry.h"
-%include "gdcmContentEntry.h"
-%include "gdcmValEntry.h"
-%include "gdcmBinEntry.h"
+%include "gdcmDataEntry.h"
 %include "gdcmSeqEntry.h"
 %include "gdcmVR.h"
 %include "gdcmTS.h"