%module gdcm
-#pragma SWIG nowarn=504
+#pragma SWIG nowarn=504,510
%{
#include <iostream>
#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"
#include "gdcmDictEntry.h"
#include "gdcmDictSet.h"
#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;
%}
////////////////////////////////////////////////
// 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;
////////////////////////////////////////////////
{
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
{
$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
%ignore gdcm::binary_write(std::ostream &,uint32_t const &);
%ignore gdcm::binary_write(std::ostream &,uint16_t const &);
-%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::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 all placed in gdcmCommon.h
%ignore GDCM_UNKNOWN;
// Warning: Order matters !
%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 "gdcmDictEntry.h"
%include "gdcmDict.h"
%include "gdcmDictSet.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....
-/////////////////////////////////////
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff