COMP: Get rid of: Warning(510): friend function 'operator <<' ignored.

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index fb1a016a8db4570248a43f9ccfa27a08a4f69498..a1d6ea19ad4d633b7f23e1a76d7058b459ee0c8e 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -1,11 +1,15 @@
 %module gdcm
-#pragma SWIG nowarn=504
+#pragma SWIG nowarn=504,510
 %{
 #include <iostream>
 
 #include "gdcmCommon.h"
 #include "gdcmBase.h"
+#include "gdcmRefCounter.h"
+#include "gdcmTagKey.h"
+#include "gdcmVRKey.h"
 #include "gdcmDict.h"
+#include "gdcmDicomEntry.h"
 #include "gdcmDictEntry.h"
 #include "gdcmDictSet.h"
 #include "gdcmDicomDir.h"
@@ -28,9 +32,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"
@@ -103,10 +105,10 @@ typedef unsigned long long uint64_t;
    {
       if(dynamic_cast<SeqEntry *>($1)) // SeqEntry *
          newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__SeqEntry,0);
-      else if(dynamic_cast<BinEntry *>($1)) // BinEntry *
-         newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__BinEntry,0);
-      else // ValEntry *
-         newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__ValEntry,0);
+      else if(dynamic_cast<DataEntry *>($1)) // DataEntry *
+         newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__DataEntry,0);
+      else
+         newEntry = NULL;
    }
    else
    {
@@ -203,6 +205,16 @@ 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::VRKey::operator=(const VRKey &_val);
+%ignore gdcm::VRKey::operator=(const std::string &_val);
+%ignore gdcm::VRKey::operator=(const char *_val);
+%ignore gdcm::VRKey::operator[](const unsigned int &_id) const;
+%ignore gdcm::VRKey::operator[](const unsigned int &_id);
+
+%ignore gdcm::TagKey::operator=(const TagKey &_val);
+%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);
@@ -214,18 +226,27 @@ typedef unsigned long long uint64_t;
 %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 *GDCM_NOTASCII = "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 *GDCM_NOTASCII  = "gdcm::NotAscii";
+%constant const char *GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded";
+%constant const char *VRUNKNOWN      = "  ";
 
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !
 %include "gdcmCommon.h"
 %include "gdcmBase.h"
+%include "gdcmRefCounter.h"
+%include "gdcmTagKey.h"
+%include "gdcmVRKey.h"
+%include "gdcmDicomEntry.h"
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
 %include "gdcmDictSet.h"
@@ -247,55 +268,8 @@ 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"
 %include "gdcmDictGroupName.h"
-
-////////////////////////////////////////////////////////////////////////////
-// Notes on swig and this file gdcm.i:
-//
-/////////////////////////////////////
-// Note 1: swig collision of method overloading and %typemap
-// Consider the following junk.i file:
-//     %module junk
-//     %{
-//     #include <string>
-//     #include <iostream>
-//     void Junk(std::string const & bozo) { std::cout << bozo << std::endl; }
-//     void Junk() { std::cout << "Renamed Junk()" << std::endl; }
-//     %}
-//   
-//     %typemap(python, in) std::string const &
-//     {
-//     $1 = new std::string( PyString_AsString( $input ) );
-//     }
-//     void Junk();
-//     void Junk(std::string const & bozo);
-//
-// that we compile on linux with:
-//    swig -c++ -python junk.i
-//    g++ -g -I/usr/include/python2.3/ -o junk_wrap.o -c junk_wrap.cxx
-//    g++ junk_wrap.o -shared -g -o _junk.so -L/usr/lib/python2.3/config \
-//        -lpython2.3
-// and invoque with:
-//    python -c 'from junk import *; Junk("aaa") '
-// then we get the following unexpected (for novice) python TypeError:
-//    TypeError: No matching function for overloaded 'Junk'
-//
-// This happens because the swig generated code (at least for python) does
-// the following two stage process:
-//   1/ first do a dynamic dispatch ON THE NUMBER OF ARGUMENTS of the overloaded
-//      Junk function (the same happens with method of course). [Note that the
-//      dispatch is NOT done on the type of the arguments].
-//   2/ second apply the typemap.
-// When the first dynamic dispatch is executed, the swig generated code
-// has no knowledge of the typemap, and thus expects a pointer to a std::string
-// type i.e. an argument to Junk of the form _p_std__int<address>. But this
-// is not what python handles to Junk ! An invocation of the form 'Junk("aaa")'
-// will make Python pass a PyString to swig (and this is precisely why we
-// wrote the typemap). And this will fail....
-/////////////////////////////////////