%module gdcm
+#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 "gdcmDicomDirPatient.h"
#include "gdcmDicomDirStudy.h"
#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirVisit.h"
+#include "gdcmDicomDirPrivate.h"
+#include "gdcmDirList.h"
#include "gdcmDocEntrySet.h"
#include "gdcmDocument.h"
#include "gdcmElementSet.h"
#include "gdcmSQItem.h"
#include "gdcmUtil.h"
#include "gdcmDocEntry.h"
-#include "gdcmContentEntry.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
#include "gdcmSeqEntry.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);
- }
-}
+#include "gdcmVR.h"
+#include "gdcmTS.h"
+#include "gdcmDictGroupName.h"
/// This is required in order to avoid %including all the gdcm include files.
-using namespace gdcm;
+using namespace GDCM_NAME_SPACE;
%}
////////////////////////////////////////////////
// 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;
////////////////////////////////////////////////
// Convert a DocEntry * to the real derived class
-%typemap(out) gdcm::DocEntry *
+%typemap(out) GDCM_NAME_SPACE::DocEntry *
{
PyObject *newEntry;
if($1)
{
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);
+ newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_GDCM_NAME_SPACE__SeqEntry,0);
+ else if(dynamic_cast<DataEntry *>($1)) // DataEntry *
+ newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_GDCM_NAME_SPACE__DataEntry,0);
+ else
+ newEntry = NULL;
}
else
{
$result = newEntry;
}
-////////////////////////////////////////////////
-// Convert an STL list<> to a python native list
-//%typemap(out) std::list<std::string> *
-//{
-// PyObject *newItem = (PyObject *)0;
-// PyObject *newList = PyList_New(0); // The result of this typemap
-//
-// for (std::list<std::string>::iterator strIt = ($1)->begin();
-// strIt != ($1)->end();
-// ++strIt)
-// {
-// newItem = PyString_FromString(strIt->c_str());
-// PyList_Append( newList, newItem);
-// }
-// $result = newList;
-//}
-
-//////////////////////////////////////////////////////////////////
-// Convert an STL map<> (hash table) to a python native dictionary
-//%typemap(out) std::map<std::string, std::list<std::string> > *
-//{
-// PyObject *newDict = PyDict_New(); // The result of this typemap
-// PyObject *newKey = (PyObject *)0;
-// PyObject *newVal = (PyObject *)0;
-//
-// for (std::map<std::string,
-// std::list<std::string> >::iterator tag = ($1)->begin();
-// tag != ($1)->end(); ++tag)
-// {
-// std::string first = tag->first;
-// // Do not publish entries whose keys is made of spaces
-// if (first.length() == 0)
-// continue;
-// newKey = PyString_FromString(first.c_str());
-//
-// PyObject *newList = PyList_New(0);
-// for (std::list<std::string>::iterator itemIt = tag->second.begin();
-// itemIt != tag->second.end();
-// ++itemIt)
-// {
-// newVal = PyString_FromString(itemIt->c_str());
-// PyList_Append( newList, newVal);
-// }
-// PyDict_SetItem( newDict, newKey, newList);
-// }
-// $result = newDict;
-//}
-
-/////////////////////////////////////////////////////////
-// Convert a c++ hash table in a python native dictionary
-//%typemap(out) gdcm::TagDocEntryHT &
-//{
-// PyObject *newDict = PyDict_New(); // The result of this typemap
-// std::string rawName; // Element name as gotten from gdcm
-// PyObject *newKey = (PyObject *)0; // Associated name as python object
-// std::string rawValue; // Element value as gotten from gdcm
-// PyObject *newVal = (PyObject *)0; // Associated value as python object
-//
-// for (gdcm::TagDocEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag)
-// {
-// // The element name shall be the key:
-// rawName = tag->second->GetName();
-// // gdcm unrecognized (including not loaded because their size exceeds
-// // the user specified treshold) elements are exported with their
-// // TagKey as key.
-// if (rawName == "Unknown")
-// rawName = tag->second->GetKey();
-// newKey = PyString_FromString(rawName.c_str());
-//
-// // Element values are striped from leading/trailing spaces
-// gdcm::ValEntry *valEntryPtr = dynamic_cast< gdcm::ValEntry* >(tag->second);
-// if ( valEntryPtr )
-// {
-// rawValue = valEntryPtr->GetValue();
-// }
-// else
-// continue;
-// newVal = PyString_FromString(rawValue.c_str());
-// PyDict_SetItem( newDict, newKey, newVal);
-// }
-// $result = newDict;
-//}
-
-/////////////////////////////////////
-//%typemap(out) ListDicomDirPatient &
-//{
-// PyObject *newItem = (PyObject *)0;
-// $result = PyList_New(0); // The result of this typemap
-//
-// for (std::list<gdcm::DicomDirPatient *>::iterator newIt = ($1)->begin();
-// newIt != ($1)->end(); ++newIt)
-// {
-// newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirPatient,0);
-// PyList_Append($result, newItem);
-// }
-//}
-
-//%typemap(out) ListDicomDirStudy &
-//{
-// PyObject *newItem = (PyObject *)0;
-// $result = PyList_New(0); // The result of this typemap
-//
-// for (std::list<gdcm::DicomDirStudy *>::iterator newIt = ($1)->begin();
-// newIt != ($1)->end(); ++newIt)
-// {
-// newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirStudy,0);
-// PyList_Append($result, newItem);
-// }
-//}
-
-//%typemap(out) ListDicomDirSerie &
-//{
-// PyObject* newItem = (PyObject*)0;
-// $result = PyList_New(0); // The result of this typemap
-//
-// for (std::list<gdcm::DicomDirSerie *>::iterator newIt = ($1)->begin();
-// newIt != ($1)->end(); ++newIt)
-// {
-// newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirSerie,0);
-// PyList_Append($result, newItem);
-// }
-//}
-
-//%typemap(out) ListDicomDirImage &
-//{
-// PyObject* newItem = (PyObject*)0;
-// $result = PyList_New(0); // The result of this typemap
-//
-// for (std::list<gdcm::DicomDirImage *>::iterator newIt = ($1)->begin();
-// newIt != ($1)->end(); ++newIt)
-// {
-// newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirImage,0);
-// PyList_Append($result, newItem);
-// }
-//}
-
-////////////////////////////////////////////////////////////////////////////
-// 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) ( gdcm::DicomDir::Method *,
- void * = NULL,
- gdcm::DicomDir::Method * = NULL )
+//////////////////// STL string versus Python str ////////////////////////
+// Convertion returning a C++ string.
+%typemap(out) std::string
{
- if($input!=Py_None)
- {
- Py_INCREF($input);
- $1=gdcmPythonVoidFunc;
- $2=$input;
- $3=gdcmPythonVoidFuncArgDelete;
- }
- else
- {
- $1=NULL;
- $2=NULL;
- $3=NULL;
- }
+ $result = PyString_FromString(($1).c_str());
}
-//////////////////// STL string versus Python str ////////////////////////
-// Convertion returning a C++ string.
-%typemap(out) string, std::string
+%typemap(out) string
{
$result = PyString_FromString(($1).c_str());
}
+%typemap(out) std::string const &
+{
+ $result = PyString_FromString(($1)->c_str());
+}
+
// Convertion of incoming Python str to STL string
%typemap(python, in) const std::string, std::string
{
}
// Same convertion as above but references (since swig converts C++
-// refererences to pointers)
+// references to pointers)
%typemap(python, in) std::string const &
{
$1 = new std::string( PyString_AsString( $input ) );
}
//////////////////// gdcm.TagName versus Python str //////////////////////
-%typemap(out) gdcm::TagName, const gdcm::TagName &
+%typemap(out) GDCM_NAME_SPACE::TagName, const GDCM_NAME_SPACE::TagName &
{
$result = PyString_FromString(($1)->c_str());
}
// Convertion of incoming Python str to STL string
-%typemap(python, in) const gdcm::TagName, gdcm::TagName
+%typemap(python, in) const GDCM_NAME_SPACE::TagName, GDCM_NAME_SPACE::TagName
{
$1 = PyString_AsString($input);
}
// Same convertion as above but references (since swig converts C++
// refererences to pointers)
-%typemap(python, in) gdcm::TagName const &
+%typemap(python, in) GDCM_NAME_SPACE::TagName const &
{
$1 = new std::string( PyString_AsString( $input ) );
}
-
////////////////////////////////////////////////////////////////////////////
// Because overloading and %rename don't work together (see below Note 1)
// we need to ignore some methods (e.g. the overloaded default constructor).
-// The gdcm::File class doesn't have any SetFilename method anyhow, and
+// The GDCM_NAME_SPACE::File class doesn't have any SetFilename method anyhow, and
// this constructor is only used internaly (not from the API) so this is
// not a big loss.
-%ignore gdcm::binary_write(std::ostream &,uint32_t const &);
-%ignore gdcm::binary_write(std::ostream &,uint16_t const &);
+%ignore GDCM_NAME_SPACE::binary_write(std::ostream &,uint32_t const &);
+%ignore GDCM_NAME_SPACE::binary_write(std::ostream &,uint16_t const &);
-%ignore gdcm::File::File();
-%ignore gdcm::DicomDir::DicomDir();
+%ignore GDCM_NAME_SPACE::VRKey::operator=(const VRKey &_val);
+%ignore GDCM_NAME_SPACE::VRKey::operator=(const std::string &_val);
+%ignore GDCM_NAME_SPACE::VRKey::operator=(const char *_val);
+%ignore GDCM_NAME_SPACE::VRKey::operator[](const unsigned int &_id) const;
+%ignore GDCM_NAME_SPACE::VRKey::operator[](const unsigned int &_id);
+
+%ignore GDCM_NAME_SPACE::TagKey::operator=(const TagKey &_val);
+%ignore GDCM_NAME_SPACE::TagKey::operator[](const unsigned int &_id) const;
+%ignore GDCM_NAME_SPACE::TagKey::operator[](const unsigned int &_id);
// Ignore all placed in gdcmCommon.h
%ignore GDCM_UNKNOWN;
%ignore GDCM_BINLOADED;
%ignore GDCM_NOTLOADED;
%ignore GDCM_UNREAD;
-
+%ignore GDCM_NOTASCII;
+%ignore GDCM_PIXELDATA;
+%ignore GDCM_LEGACY;
+%ignore GDCM_VRUNKNOWN;
+%ignore GDCM_FILESEPARATOR;
+
+%constant const char *UNKNOWN = "GDCM::Unknown";
+%constant const char *UNFOUND = "GDCM::Unfound";
+%constant const char *BINLOADED = "GDCM::Binary data";
+%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 = " ";
+%constant const char GDCM_FILESEPARATOR = '\\';
////////////////////////////////////////////////////////////////////////////
// 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 "gdcmDicomDirElement.h"
%include "gdcmDicomDirObject.h"
%include "gdcmDicomDirImage.h"
+%include "gdcmDicomDirPrivate.h"
%include "gdcmDicomDirSerie.h"
+%include "gdcmDicomDirVisit.h"
%include "gdcmDicomDirStudy.h"
%include "gdcmDicomDirPatient.h"
%include "gdcmDicomDirMeta.h"
%include "gdcmDocument.h"
%include "gdcmFile.h"
%include "gdcmSerieHelper.h"
-%include "gdcmFile.h"
+%include "gdcmFileHelper.h"
%include "gdcmUtil.h"
%include "gdcmGlobal.h"
%include "gdcmDicomDir.h"
%include "gdcmDocEntry.h"
-%include "gdcmContentEntry.h"
-%include "gdcmValEntry.h"
-%include "gdcmBinEntry.h"
+%include "gdcmDataEntry.h"
%include "gdcmSeqEntry.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....
-/////////////////////////////////////
+%include "gdcmVR.h"
+%include "gdcmTS.h"
+%include "gdcmDictGroupName.h"
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff