ENH: hopefully fixed swig wrapping

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 9704d6be2c37bcedef4cbcea73d659b51df52e37..8c2d95d369ffa593eae0c49909b7f904d1319db8 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -13,7 +13,6 @@
 #include "gdcmTagKey.h"
 #include "gdcmVRKey.h"
 #include "gdcmDict.h"
-#include "gdcmDicomEntry.h"
 #include "gdcmDictEntry.h"
 #include "gdcmDictSet.h"
 #include "gdcmDicomDir.h"
@@ -62,7 +61,7 @@ typedef unsigned long long uint64_t;
 
 ////////////////////////////////////////////////
 // Convert a DocEntry * to the real derived class
-%typemap(out) gdcm::DocEntry * 
+%typemap(out) gdcm::DocEntry *
 {
    PyObject *newEntry;
 
@@ -150,14 +149,6 @@ typedef unsigned long long uint64_t;
 %ignore gdcm::TagKey::operator[](const unsigned int &_id) const;
 %ignore gdcm::TagKey::operator[](const unsigned int &_id);
 
-%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 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;
@@ -168,6 +159,7 @@ typedef unsigned long long uint64_t;
 %ignore GDCM_PIXELDATA;
 %ignore GDCM_LEGACY;
 %ignore GDCM_VRUNKNOWN;
+%ignore GDCM_FILESEPARATOR;
 
 %constant const char *UNKNOWN        = "gdcm::Unknown";
 %constant const char *UNFOUND        = "gdcm::Unfound";
@@ -177,7 +169,7 @@ typedef unsigned long long uint64_t;
 %constant const char *GDCM_NOTASCII  = "gdcm::NotAscii";
 %constant const char *GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded";
 %constant const char *VRUNKNOWN      = "  ";
-
+%constant const char GDCM_FILESEPARATOR = '\\';
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !
 %include "gdcmCommon.h"
@@ -189,7 +181,6 @@ typedef unsigned long long uint64_t;
 %include "gdcmCommandManager.h"
 %include "gdcmTagKey.h"
 %include "gdcmVRKey.h"
-%include "gdcmDicomEntry.h"
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
 %include "gdcmDictSet.h"