${GDCM_INC}
)
-#ADD_CUSTOM_TARGET(mathieu ALL)
-
-SET(GDCM_PYTHON_SOURCES
- gdcm_wrap.cxx
-)
-
SET_SOURCE_FILES_PROPERTIES(gdcm_wrap.cxx GENERATED)
-ADD_LIBRARY(pygdcm ${GDCM_PYTHON_SOURCES})
+ADD_LIBRARY(pygdcm gdcm_wrap.cxx)
# http://www.cmake.org/pipermail/cmake/2003-August/004190.html
# SET_TARGET_PROPERTIES(pygdcm PROPERTIES PREFIX "_")
TARGET_LINK_LIBRARIES(pygdcm
)
#-----------------------------------------------------------------------------
+# SWIG Wrapping
+#
+
# As of 09/10/2003 there was no FindSWIG.cmake
# later we should use SWIG instead of swig
# Build our custom command :
COMMENT "Generating gdcm_wrap.cxx based on gdcm.i"
)
+#-----------------------------------------------------------------------------
+# VTK Wrapping
+#
IF(GDCM_VTK)
INCLUDE_DIRECTORIES(
${GDCM_SOURCE_DIR}/vtk
ADD_LIBRARY(vtkgdcmPython SHARED ${gdcmfoo})
# set the libraries to link against
TARGET_LINK_LIBRARIES (vtkgdcmPython
- pygdcm
- vtkgdcm
- vtkCommonPython
- vtkIOPython)
+ pygdcm
+ vtkgdcm
+ vtkCommonPython
+ vtkIOPython)
ENDIF (GDCM_WRAP_PYTHON)
#generate a setup.py according to VTK installation
GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE)
CONFIGURE_FILE(
${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
- ${GDCM_SOURCE_DIR}/setup.py
+ ${GDCM_BINARY_DIR}/setup.py
)
ENDIF(GDCM_VTK)
#INSTALL_FILES(/include "\\.h$")
#INSTALL_TARGETS(/lib/ gdcm)
-INSTALL_TARGETS(/lib/ "gdcm.py")
+#INSTALL_TARGETS(/lib/ gdcm.py)
+# gdcm.py is a file generated by swig
+# then from python you can do import gdcm, and it will load _gdcm.so
+INSTALL_FILES(/lib/ .py gdcm.py)
# When installing swig-generated python module one should pay attention
# to library naming convention, see here for more detail:
#include "gdcmDicomDirSerie.h"
#include "gdcmDicomDirImage.h"
-using namespace std;
-
////////////////////////////////////////////////////////////////////////////
// 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] == ' ') )
{
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();
%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();
+ for (std::list<std::string>::iterator NewString = ($1)->begin();
NewString != ($1)->end(); ++NewString) {
NewItem = PyString_FromString(NewString->c_str());
PyList_Append( NewList, NewItem);
PyObject* NewKey = (PyObject*)0;
PyObject* NewVal = (PyObject*)0;
- for (map<string, list<string> >::iterator tag = ($1)->begin();
+ for (std::map<std::string, std::list<std::string> >::iterator tag = ($1)->begin();
tag != ($1)->end(); ++tag) {
- string first = tag->first;
+ 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();
+ 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);
// 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
+ std::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
+ std::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) {
%typemap(out) TagHeaderEntryHT {
PyObject* NewDict = PyDict_New(); // The result of this typemap
- string RawName; // Element name as gotten from gdcm
+ std::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
+ std::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) {
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmDicomDirPatient *>::iterator New = ($1)->begin();
+ for (std::list<gdcmDicomDirPatient *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirPatient,1);
PyList_Append($result, NewItem);
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmDicomDirStudy *>::iterator New = ($1)->begin();
+ for (std::list<gdcmDicomDirStudy *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirStudy,1);
PyList_Append($result, NewItem);
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmDicomDirSerie *>::iterator New = ($1)->begin();
+ for (std::list<gdcmDicomDirSerie *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirSerie,1);
PyList_Append($result, NewItem);
PyObject* NewItem = (PyObject*)0;
$result = PyList_New(0); // The result of this typemap
- for (list<gdcmDicomDirImage *>::iterator New = ($1)->begin();
+ for (std::list<gdcmDicomDirImage *>::iterator New = ($1)->begin();
New != ($1)->end(); ++New) {
NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirImage,1);
PyList_Append($result, NewItem);
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff