%module gdcm
%{
#include "gdcmCommon.h"
-#include "gdcmDictEntry.h"
#include "gdcmDict.h"
+#include "gdcmDictEntry.h"
#include "gdcmDictSet.h"
-#include "gdcmParser.h"
-#include "gdcmHeaderEntry.h"
+#include "gdcmDicomDir.h"
+#include "gdcmDicomDirElement.h"
+#include "gdcmDicomDirImage.h"
+#include "gdcmDicomDirMeta.h"
+#include "gdcmDicomDirObject.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDocEntrySet.h"
+#include "gdcmDocument.h"
+#include "gdcmElementSet.h"
+#include "gdcmFile.h"
+#include "gdcmGlobal.h"
#include "gdcmHeader.h"
#include "gdcmHeaderHelper.h"
-#include "gdcmFile.h"
+#include "gdcmRLEFramesInfo.h"
+#include "gdcmJPEGFragmentsInfo.h"
+#include "gdcmSQItem.h"
#include "gdcmUtil.h"
-#include "gdcmObject.h"
-#include "gdcmDicomDir.h"
-#include "gdcmDicomDirElement.h"
-#include "gdcmMeta.h"
-#include "gdcmPatient.h"
-#include "gdcmStudy.h"
-#include "gdcmSerie.h"
-#include "gdcmImage.h"
-
-using namespace std;
+#include "gdcmValEntry.h"
////////////////////////////////////////////////////////////////////////////
// Utility functions on strings for removing leading and trailing spaces
-void EatLeadingAndTrailingSpaces(string & s) {
+void EatLeadingAndTrailingSpaces(std::string & s) {
while ( s.length() && (s[0] == ' ') )
s.erase(0,1);
while ( s.length() && (s[s.length()-1] == ' ') )
s.erase(s.length()-1, 1);
}
-void vtkPythonVoidFunc(void *arg)
+void gdcmPythonVoidFunc(void *arg)
{
PyObject *arglist, *result;
PyObject *func = (PyObject *)arg;
{
if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt))
{
- cerr << "Caught a Ctrl-C within python, exiting program.\n";
+ std::cerr << "Caught a Ctrl-C within python, exiting program.\n";
Py_Exit(1);
}
PyErr_Print();
}
}
-void vtkPythonVoidFuncArgDelete(void *arg)
+void gdcmPythonVoidFuncArgDelete(void *arg)
{
PyObject *func = (PyObject *)arg;
if (func)
}
}
+using namespace gdcm;
%}
typedef unsigned short guint16;
typedef unsigned int guint32;
-////////////////////////////////////////////////////////////////////////////
-// Global variables get exported to cvar in Python
-%immutable;
-extern gdcmGlobal gdcmGlob;
-%mutable;
-
////////////////////////////////////////////////////////////////////////////
%typemap(out) std::list<std::string> * {
- PyObject* NewItem = (PyObject*)0;
- PyObject* NewList = PyList_New(0); // The result of this typemap
- for (list<string>::iterator NewString = ($1)->begin();
- NewString != ($1)->end(); ++NewString) {
- NewItem = PyString_FromString(NewString->c_str());
- PyList_Append( NewList, NewItem);
- }
- $result = NewList;
+ PyObject* NewItem = (PyObject*)0;
+ PyObject* NewList = PyList_New(0); // The result of this typemap
+
+ for (std::list<std::string>::iterator NewString = ($1)->begin();
+ NewString != ($1)->end();
+ ++NewString)
+ {
+ NewItem = PyString_FromString(NewString->c_str());
+ PyList_Append( NewList, NewItem);
+ }
+ $result = NewList;
}
////////////////////////////////////////////////////////////////////////////
// Convert a c++ hash table in 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 (map<string, list<string> >::iterator tag = ($1)->begin();
- tag != ($1)->end(); ++tag) {
- string first = tag->first;
+ 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 (list<string>::iterator Item = tag->second.begin();
- Item != tag->second.end(); ++Item) {
- NewVal = PyString_FromString(Item->c_str());
- PyList_Append( NewList, NewVal);
- }
- PyDict_SetItem( NewDict, NewKey, NewList);
- }
- $result = NewDict;
+ NewKey = PyString_FromString(first.c_str());
+ PyObject* NewList = PyList_New(0);
+ for (std::list<std::string>::iterator Item = tag->second.begin();
+ Item != tag->second.end();
+ ++Item)
+ {
+ NewVal = PyString_FromString(Item->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) TagHeaderEntryHT & {
- PyObject* NewDict = PyDict_New(); // The result of this typemap
- string RawName; // Element name as gotten from gdcm
- PyObject* NewKey = (PyObject*)0; // Associated name as python object
- string RawValue; // Element value as gotten from gdcm
- PyObject* NewVal = (PyObject*)0; // Associated value as python object
-
- for (TagHeaderEntryHT::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
- RawValue = tag->second->GetValue();
- EatLeadingAndTrailingSpaces(RawValue);
- NewVal = PyString_FromString(RawValue.c_str());
-
- PyDict_SetItem( NewDict, NewKey, NewVal);
- }
- $result = NewDict;
-}
-
-%typemap(out) TagHeaderEntryHT {
- PyObject* NewDict = PyDict_New(); // The result of this typemap
- string RawName; // Element name as gotten from gdcm
- PyObject* NewKey = (PyObject*)0; // Associated name as python object
- string RawValue; // Element value as gotten from gdcm
- PyObject* NewVal = (PyObject*)0; // Associated value as python object
-
- for (TagHeaderEntryHT::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
- RawValue = tag->second->GetValue();
- EatLeadingAndTrailingSpaces(RawValue);
- NewVal = PyString_FromString(RawValue.c_str());
-
- PyDict_SetItem( NewDict, NewKey, NewVal);
- }
- $result = NewDict;
+%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
+ if (gdcm::ValEntry* ValEntryPtr =
+ dynamic_cast< gdcm::ValEntry* >(tag->second) )
+ {
+ RawValue = ValEntryPtr->GetValue();
+ }
+ else
+ continue;
+ EatLeadingAndTrailingSpaces(RawValue);
+ NewVal = PyString_FromString(RawValue.c_str());
+ PyDict_SetItem( NewDict, NewKey, NewVal);
+ }
+ $result = NewDict;
}
////////////////////////////////////////////////////////////////////////////
-%typemap(out) ListPatient & {
+%typemap(out) ListDicomDirPatient & {
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmPatient *>::iterator New = ($1)->begin();
+ for (std::list<gdcm::DicomDirPatient *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
- NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmPatient,1);
+ NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirPatient,1);
PyList_Append($result, NewItem);
}
}
-%typemap(out) ListStudy & {
+%typemap(out) ListDicomDirStudy & {
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmStudy *>::iterator New = ($1)->begin();
+ for (std::list<gdcm::DicomDirStudy *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
- NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmStudy,1);
+ NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirStudy,1);
PyList_Append($result, NewItem);
}
}
-%typemap(out) ListSerie & {
+%typemap(out) ListDicomDirSerie & {
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmSerie *>::iterator New = ($1)->begin();
+ for (std::list<gdcm::DicomDirSerie *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
- NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmSerie,1);
+ NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirSerie,1);
PyList_Append($result, NewItem);
}
}
-%typemap(out) ListImage & {
+%typemap(out) ListDicomDirImage & {
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmImage *>::iterator New = ($1)->begin();
+ for (std::list<gdcm::DicomDirImage *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
- NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmImage,1);
+ NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirImage,1);
PyList_Append($result, NewItem);
}
}
////////////////////////////////////////////////////////////////////////////
// Deals with function returning a C++ string.
-%typemap(python, in) (gdcmMethod *,void * =NULL,gdcmMethod * =NULL) {
+%typemap(python, in) (gdcm::Method *,void * =NULL,gdcm::Method * =NULL) {
if($input!=Py_None)
{
Py_INCREF($input);
- $1=vtkPythonVoidFunc;
+ $1=gdcmPythonVoidFunc;
$2=$input;
- $3=vtkPythonVoidFuncArgDelete;
+ $3=gdcmPythonVoidFuncArgDelete;
}
else
{
}
////////////////////////////////////////////////////////////////////////////
+// Warning: Order matters !
%include "gdcmCommon.h"
+%include "gdcmRLEFramesInfo.h"
+%include "gdcmJPEGFragmentsInfo.h"
%include "gdcmDictEntry.h"
%include "gdcmDict.h"
+%include "gdcmDocEntry.h"
+%include "gdcmDocEntrySet.h"
+%include "gdcmElementSet.h"
%include "gdcmDictSet.h"
-%include "gdcmParser.h"
-%include "gdcmHeaderEntry.h"
+%include "gdcmTS.h"
+%include "gdcmVR.h"
+%include "gdcmSQItem.h"
+%include "gdcmDicomDirElement.h"
+%include "gdcmDicomDirObject.h"
+%include "gdcmDicomDirImage.h"
+%include "gdcmDicomDirSerie.h"
+%include "gdcmDicomDirStudy.h"
+%include "gdcmDicomDirPatient.h"
+%include "gdcmDicomDirMeta.h"
+%include "gdcmDocument.h"
%include "gdcmHeader.h"
%include "gdcmHeaderHelper.h"
%include "gdcmFile.h"
%include "gdcmUtil.h"
-%include "gdcmObject.h"
+%include "gdcmGlobal.h"
%include "gdcmDicomDir.h"
-%include "gdcmDicomDirElement.h"
-%include "gdcmMeta.h"
-%include "gdcmPatient.h"
-%include "gdcmStudy.h"
-%include "gdcmSerie.h"
-%include "gdcmImage.h"
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff