* Changed the layout of the python part to avoid bloating main

        directory with setup.py, distutilsSwigCPlusPlus.py, MANIFEST.in
        i.e. the distutils arsenal. All the python related stuff is
        again in a python subdir, but the package itself is now in
        python/gdcmPython.
      * setup.py was cleaned up:
        - pythonIncludePath removed
        - python setup.py bdist target is now functional.
      * gdcmPython/__init__.py doesn't export FileName any more (to avoid
        collision with other packages). gdcmPython/demo/*.py changed
        accordingly.   --- Frog

diff --git a/.cvsignore b/.cvsignore
index b00a4fab8a1fb026e5b00480bf4c0d051b40b212..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +0,0 @@
-*.pyc
-build
-dist
-MANIFEST

diff --git a/ChangeLog b/ChangeLog
index ae252d3b2978f4940602572497a4bed98bdc7862..b53b5f75721eca4b8981e3adb13997e3729d7c84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-01-17 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+      * Changed the layout of the python part to avoid bloating main
+        directory with setup.py, distutilsSwigCPlusPlus.py, MANIFEST.in
+        i.e. the distutils arsenal. All the python related stuff is
+        again in a python subdir, but the package itself is now in
+        python/gdcmPython.
+      * setup.py was cleaned up:
+        - pythonIncludePath removed
+        - python setup.py bdist target is now functional.
+      * gdcmPython/__init__.py doesn't export FileName any more (to avoid
+        collision with other packages). gdcmPython/demo/*.py changed
+        accordingly.
+
 2003-01-15 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * python subdir moved to gdcmPython (preparation of distutils packaging).
       * gdcmPython/setup.py and distutilsSwigCPlusPlus.py added. The

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644 (file)
index fb9a8c1..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-include distutilsSwigCPlusPlus.py

diff --git a/distutilsSwigCPlusPlus.py b/distutilsSwigCPlusPlus.py
deleted file mode 100644 (file)
index 3a840a1..0000000
--- a/distutilsSwigCPlusPlus.py
+++ /dev/null
@@ -1,131 +0,0 @@
-from distutils.command.build_ext import build_ext
-from distutils.core import Extension
-from types import ListType
-import os
-
-class mybuild_ext(build_ext):
-       """
-       This distutils command is meant to be used with MyExtension extension, which
-       defines a swig_include attribute.
-       """
-       build_ext.user_options.append(('swig-include=','S',
-                                                                                        "list of directories for swig to search in" +
-                                                                                        "for header files"))
-                                                                                        
-       def initialize_options (self):
-               build_ext.initialize_options(self)
-               self.swig_include = None
-               
-       def finalize_options (self):
-               build_ext.finalize_options(self)
-               if self.swig_include!=None:
-                       self.swig_include=self.swig_include.split(":")
-       
-       def build_extension(self, ext):
-               # command-line arguments prevail over extension arguments
-               # but if no command-line argument is defined, extension argument is
-               # taken into account
-               if self.swig_include==None:self.swig_include=ext.swig_include
-               if self.swig_cpp==None:self.swig_cpp=ext.swig_cpp
-                               
-               build_ext.build_extension(self,ext)
-       
-       def swig_sources (self, sources):
-
-               """Walk the list of source files in 'sources', looking for SWIG
-               interface (.i) files.  Run SWIG on all that are found, and
-               return a modified 'sources' list with SWIG source files replaced
-               by the generated C (or C++) files.
-               """
-
-               new_sources = []
-               swig_sources = []
-               swig_targets = {}
-
-               # XXX this drops generated C/C++ files into the source tree, which
-               # is fine for developers who want to distribute the generated
-               # source -- but there should be an option to put SWIG output in
-               # the temp dir.
-
-               ## Modified lines (compared to buil_exts.wig_sources original method)
-               if self.swig_cpp:
-                       target_ext = '_wrap.cpp'
-               else:
-                       target_ext = '_wrap.c'
-               ## End of modification
-
-               for source in sources:
-                       (base, ext) = os.path.splitext(source)
-                       if ext == ".i":             # SWIG interface file
-                               new_sources.append(base + target_ext)
-                               swig_sources.append(source)
-                               swig_targets[source] = new_sources[-1]
-                       else:
-                               new_sources.append(source)
-
-               if not swig_sources:
-                       return new_sources
-
-               swig = self.find_swig()
-               
-               ## Modified lines (compared to buil_exts.wig_sources original method)
-               swig_cmd = [swig, "-python"]
-               if self.swig_cpp:
-                       swig_cmd.append("-c++")
-
-               if self.swig_include:
-                       for pth in self.swig_include:
-                               swig_cmd.append("-I%s"%pth)
-               ## End of modification
-
-               for source in swig_sources:
-                       target = swig_targets[source]
-                       self.announce("swigging %s to %s" % (source, target))
-                       self.spawn(swig_cmd + ["-o", target, source])
-                       print swig_cmd + ["-o", target, source]
-
-               return new_sources
-
-class MyExtension(Extension):
-       """
-       This class extends basic distutils Extension class, adding two keyword 
-       arguments :
-               * swig_cpp, which triggers -c++ mode when swigging
-               * swig_include, which specifies -I flag when swigging
-       This class is meant to be build with mybuild_ext distutils command.
-       """
-       def __init__(self,swig_include=None,swig_cpp=None,**args):
-               Extension.__init__(self,**args)
-               
-               assert ((swig_include==None or type(swig_include) is ListType),
-                                 "swig_include must be a list of strings")
-                                 
-               self.swig_include = swig_include or []
-               self.swig_cpp = swig_cpp
-
-"""
-Example of use of these classes in distutils setup method :
-
-from Transfert.tcDistUtils import mybuild_ext,MyExtension
-setup(name="xxx",
-               version="X.Y",
-               description="blah blah blah",
-               author="John Doe",
-               author_email="i.hate@spam.com",
-               url="http://www.fakeurl.com",
-               packages=["yyy"],               
-               cmdclass={'build_ext':mybuild_ext}, # redirects default build_ext
-               ext_modules=[MyExtension(name="src/xxx, # instance of our Extension class
-                                                                                sources=["src/xxx.cpp",
-                                                                                                        "src/xxx.i"],
-                                                                                include_dirs=["/usr/include/python2.1",
-                                                                                                                       "/usr/include/vtk"],
-                                                                                libraries=["vtkGraphics"],
-                                                                                swig_cpp=1, # C++ support
-                                                                                swig_include=["src"] # SWIG include dirs
-                                                                               )
-                                               ]
-               )
-               
-and then run "python setup.py build"...
-"""

diff --git a/gdcmPython/.cvsignore b/gdcmPython/.cvsignore
deleted file mode 100644 (file)
index 6d82c92..0000000
--- a/gdcmPython/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-gdcm.py
-*.pyc
-gdcm_wrap.cpp
-gdcm_wrap.cxx

diff --git a/gdcmPython/Makefile b/gdcmPython/Makefile
deleted file mode 100644 (file)
index b7f2127..0000000
--- a/gdcmPython/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-.SECONDARY:
-
-SWIG = swig
-SWIGFLAGS= -python -c++
-
-TARGET=_gdcm.so
-
-GDCMDIR=../src
-GDCMLIB=$(GDCMDIR)/libgdcm.a
-GDCMINCLUDES=-I$(GDCMDIR)
-
-PYTHON=python
-PYTHON_PREFIX  =`$(PYTHON) -c "import sys; print sys.exec_prefix"`
-PYTHON_VERSION =`$(PYTHON) -c "import sys; print sys.version[:3]"`
-PYTHON_INCLUDES="-I$(PYTHON_PREFIX)/include/python$(PYTHON_VERSION)"
-
-CXXFLAGS=$(GDCMINCLUDES)
-CPPFLAGS=-g -Wall -Wunused-variable
-LDFLAGS=-g
-
-%_wrap.o : %_wrap.cxx
-       $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(PYTHON_INCLUDES) $< -o $@
-%_wrap.cxx : %.i
-       $(SWIG) $(SWIGFLAGS) $(PYTHON_INCLUDES) $(GDCMINCLUDES) -o $@ $<
-%.o : %.cxx
-       $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
-
-
-all: gdcm_wrap.o $(GDCMLIB)
-       g++ -shared $^ -o $(TARGET) $(LDFLAGS)
-
-test:
-       $(PYTHON) -c"import _gdcm"
-
-clean:
-       rm -f *_wrap* *.so *.o *.pyc gdcm.py
-
-$(GDCMLIB): FORCE
-       cd $(GDCMDIR); make
-
-FORCE:
-
-#.SECONDARY: dcm_wrap.cxx

diff --git a/gdcmPython/__init__.py b/gdcmPython/__init__.py
deleted file mode 100644 (file)
index 363c0bd..0000000
--- a/gdcmPython/__init__.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import os, sys
-
-### Setup the path to the dictionaries. WARNING: this needs to be done
-#   BEFORE importation of gdcm. We consider we found the dictionaries
-#   path when we encounter the standard dictionary i.e. the file dicomV3.dic.
-# 1/ first consider the environnement variable.
-# 2/ when this fails consider the package installation mode i.e. when the
-#    layout is such that the directory containing the dictionaries is
-#    BELOW (the root is at the top) the current directory.
-# 3/ eventually consider the pre-installation mode i.e. when the
-#    layout is such that the directory containing the dictionaries is
-#    ABOVE (the root is at the top) the current directory.
-#   
-try:
-       os.environ["GDCM_DICT_PATH"]
-       if not os.path.isfile(os.path.join(os.environ["GDCM_DICT_PATH"],
-                                          "dicomV3.dic")):
-               raise KeyError
-except KeyError:
-       # Those pathes have to be relative to the package (hence we use __path__): 
-       InstallModePath = os.path.join(__path__[0], "Dicts/")
-       if os.path.isfile(os.path.join(InstallModePath, "dicomV3.dic")):
-               os.environ["GDCM_DICT_PATH"] = InstallModePath
-               PreInstallModePath = None
-       else:
-               PreInstallModePath = os.path.join(__path__[0], "..", "Dicts/")
-               if os.path.isfile(os.path.join(PreInstallModePath, "dicomV3.dic")):
-                       os.environ["GDCM_DICT_PATH"] = PreInstallModePath
-                       InstallModePath = None
-               else:
-                       print "Unfound gdcm dictionaries path"
-                       sys.exit(1)
-
-### Import the swig generated shadow classes.
-try:
-       from gdcm import *
-except ImportError,e:
-       print e
-       raise ImportError, "gdcm extension not imported."
-
-### Set up the path to the data images (for examples and test suite)
-if InstallModePath:
-       GDCM_DATA_PATH = os.path.join(__path__[0], "Data")
-else:
-       if PreInstallModePath:
-               GDCM_DATA_PATH = os.path.join(__path__[0], "..", "Data")
-       else:
-               print "Unfound data path"
-               sys.exit(1)
-
-### Get filename from command line or default it
-try:
-       FileName = sys.argv[1]
-except IndexError:
-       FileName = os.path.join(GDCM_DATA_PATH, "test.acr")
-
-if not os.path.isfile(FileName):
-       print "Cannot open file ", FileName
-       sys.exit()

diff --git a/gdcmPython/demo/.cvsignore b/gdcmPython/demo/.cvsignore
deleted file mode 100644 (file)
index 0d20b64..0000000
--- a/gdcmPython/demo/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc

diff --git a/gdcmPython/demo/explore.py b/gdcmPython/demo/explore.py
deleted file mode 100644 (file)
index 6ca9200..0000000
--- a/gdcmPython/demo/explore.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from gdcmPython import *
-
-toRead = gdcmHeader(FileName)
-toRead.LoadElements()
-ValDict = toRead.GetPubElVal()
-ExploreElements = ["Patient Name", "Patient ID",
-                                                "Study Date", "Study Time", "Study ID",
-                                                "Study Instance UID",
-                                                "Series Number",
-                                                "Modality"]
-
-for elem in ExploreElements:
-       print "[%s] = " % elem,
-       try:
-               print "[%s]" % ValDict[elem]
-       except KeyError:
-               print "NOT FOUND"

diff --git a/gdcmPython/demo/printGroupedPublicDict.py b/gdcmPython/demo/printGroupedPublicDict.py
deleted file mode 100644 (file)
index 1dcd2f7..0000000
--- a/gdcmPython/demo/printGroupedPublicDict.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from gdcmPython import *
-toRead = gdcmHeader(FileName)
-toRead.LoadElements()
-
-print "##############################################################"
-print "### Display all the possible tags of the current public"
-print "### dictionary, but grouped by using the Fourth field"
-print "##############################################################"
-AllDictFields = toRead.GetPubTagNamesByCategory()
-for fourth in AllDictFields.keys():
-       print "   ############ Fourth group = ", fourth, " ##############"
-       for entry in  AllDictFields[fourth]:
-               print "   ", entry
-

diff --git a/gdcmPython/demo/test.py b/gdcmPython/demo/test.py
deleted file mode 100644 (file)
index c5d9da4..0000000
--- a/gdcmPython/demo/test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from gdcmPython import *
-toRead = gdcmHeader(FileName)
-toRead.LoadElements()
-
-print "##############################################################"
-print "### Display all the elements and their respective values"
-print "## found in the ", FileName, " file."
-print "##############################################################"
-ValDict = toRead.GetPubElVal()
-for key in ValDict.keys():
-       print "[%s] = [%s]" %(key, ValDict[key])

diff --git a/gdcmPython/demo/testAll.py b/gdcmPython/demo/testAll.py
deleted file mode 100644 (file)
index e46fda0..0000000
--- a/gdcmPython/demo/testAll.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from gdcmPython import *
-
-# Test each file of the Data directory
-
-AllFiles = [
-       "CR-MONO1-10-chest.dcm",
-       "CT-MONO2-16-brain.dcm",
-       "CT-MONO2-16-ort.dcm",
-       "CT-MONO2-16-ankle.dcm",
-       "CT-MONO2-8-abdo.dcm",
-       "CT-MONO2-12-lomb-an2.acr2",
-       "CT-MONO2-16-chest.dcm",
-       "MR-MONO2-12-angio-an1.acr1",
-       "MR-MONO2-12-an2.acr2",
-       "MR-MONO2-16-head.dcm",
-       "MR-MONO2-12-shoulder.dcm",
-       "OT-PAL-8-face.dcm",
-       "OT-MONO2-8-a7.dcm",
-       "US-RGB-8-esopecho.dcm",
-       "US-RGB-8-epicard.dcm",
-       "MR-MONO2-8-16x-heart.dcm",
-       "NM-MONO2-16-13x-heart.dcm",
-       "US-MONO2-8-8x-execho.dcm",
-       "US-PAL-8-10x-echo.dcm",
-       "XA-MONO2-8-12x-catheter.dcm",
-       ]
-
-if __name__ == '__main__':
-       for file in AllFiles:
-               fileName = os.path.join(GDCM_DATA_PATH, file)
-               print "############## file :", fileName
-               toRead = gdcmHeader(fileName)
-               toRead.LoadElements()
-               ValDict = toRead.GetPubElVal()
-               for key in ValDict.keys():
-                       print "   [%s] = [%s]" %(key, ValDict[key])

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
deleted file mode 100644 (file)
index 46c2ec1..0000000
--- a/gdcmPython/gdcm.i
+++ /dev/null
@@ -1,75 +0,0 @@
-%module gdcm
-%{
-#include "gdcm.h"
-
-// Utility functions on strings for removing leading and trailing spaces
-void EatLeadingAndTrailingSpaces(string & s) {
-       while ( s.length() && (s[0] == ' ') )
-               s.erase(0,1);
-       while ( s.length() && (s[s.length()-1] == ' ') )
-               s.erase(s.length()-1, 1);
-}
-%}
-typedef  unsigned short guint16;
-typedef  unsigned int guint32;
-
-%typemap(out) list<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;
-}
-
-%typemap(out) map<string, list<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) {
-               NewKey = PyString_FromString(tag->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;
-}
-
-// Return an hash table as a python native dictionary
-%typemap(out) TagElValueHT & {
-       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 (TagElValueHT::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;
-}
-
-%include gdcm.h

diff --git a/gdcmPython/testSuite.py b/gdcmPython/testSuite.py
deleted file mode 100644 (file)
index e053d65..0000000
--- a/gdcmPython/testSuite.py
+++ /dev/null
@@ -1,505 +0,0 @@
-import unittest
-import os
-from gdcmPython import *
-
-class gdcmTestCase(unittest.TestCase):
-       # The files whose name starts with a modality (e.g. CR-MONO1-10-chest.dcm)
-       # come from Sebastien Barre's Dicom2 highly recommendable site
-       # http://www.barre.nom.fr/medical/samples/index.html
-       BarreFiles = [
-               ####################################
-               # CR modality examples:
-               ####################################
-               ["CR-MONO1-10-chest.dcm",
-                       [ ["Modality", "CR"],
-                         #"Transfer Syntax UID" is absent.
-                         ["Rows", "440"],
-                         ["Columns", "440"],
-                         ["Bits Stored", "10"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "9"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "FUJI PHOTO FILM CO. LTD."],
-                         ["Manufacturer Model Name", "9000"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:776 Length:387200"] ] ],
-               ####################################
-               # CT modality examples:
-               ####################################
-               ["CT-MONO2-16-brain.dcm",
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"],  # Explicit VR, LE
-                         ["Modality", "CT"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "16"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "15"],
-                         ["Pixel Representation", "1"],
-                         ["Manufacturer", "Picker International, Inc."],
-                         ["Manufacturer Model Name", "PQ5000"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1680 Length:524288"] ] ],
-               ["CT-MONO2-16-ort.dcm",
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2"],  # Implicit VR, LE
-                         ["Modality", "CT"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "16"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "15"],
-                         ["Pixel Representation", "1"],
-                         ["Manufacturer", "GE MEDICAL SYSTEMS"],
-                         ["Manufacturer Model Name", "HiSpeed CT/i"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1674 Length:524288"] ] ],
-               ["CT-MONO2-16-ankle.dcm",
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2"],  # Implicit, little
-                         ["Modality", "CT"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "16"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "15"],
-                         ["Pixel Representation", "1"],
-                         ["Manufacturer", "GE MEDICAL SYSTEMS"],
-                         ["Manufacturer Model Name", "GENESIS_ZEUS"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1148 Length:524288"] ] ],
-               ["CT-MONO2-8-abdo.dcm",
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2"],  # Implicit, little
-                         ["Modality", "CT"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "FUJI"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:796 Length:262144"] ] ],
-               ["CT-MONO2-12-lomb-an2.acr2",
-                       [ ["Modality", "CT"],
-                         #"Transfer Syntax UID" and "Photometric Interpretation" are absent.
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "SIEMENS"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1230 Length:524288"] ] ],
-               ["CT-MONO2-16-chest.dcm",
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"], # jpeg...
-                         ["Modality", "CT"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "400"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "16"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "15"],
-                         ["Pixel Representation", "1"],
-                         ["Manufacturer", "GE MEDICAL SYSTEMS"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1638 Length:143498"] ] ],
-               ####################################
-               ### MR modality examples:
-               ####################################
-               ["MR-MONO2-12-angio-an1.acr1",
-                       [ ["Recognition Code", "ACR-NEMA 1.0"],
-                         ["Modality", "MR"],
-                         #"Transfer Syntax UID" and "Photometric Interpretation" are absent.
-                         ["Rows", "256"],
-                         ["Columns", "256"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "12"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Philips"],
-                         # Note: 256*256*12/8 = 98304
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:650 Length:98304"] ] ],
-               ["MR-MONO2-12-an2.acr2",
-                       [ ["Modality", "MR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "256"],
-                         ["Columns", "256"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "SIEMENS"],
-                         ["Manufacturer Model Name", "MAGNETOM VISION"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1866 Length:131072"] ] ],
-               ["MR-MONO2-16-head.dcm",
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2"], # Imp VR, LE
-                         ["Modality", "MR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "256"],
-                         ["Columns", "256"],
-                         ["Bits Stored", "16"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "15"],
-                         ["Pixel Representation", "1"],
-                         ["Manufacturer", "GE MEDICAL SYSTEMS"],
-                         ["Manufacturer Model Name", "GENESIS_SIGNA"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1804 Length:131072"] ] ],
-               # MR-MONO2-12-shoulder example is present in the Jpeg section.
-               # MR-MONO2-16-knee is not present in the test suite since it is too
-               #    closely related to MR-MONO2-16-head.dcm to be of interest.
-               ####################################
-               # OT modality examples:
-               ####################################
-               # OT-MONO2-8-hip is not present in the test suite since it is too
-               #    closely related to OT-MONO2-8-a7 to be of interest.
-               ["OT-PAL-8-face.dcm",
-                       # Interest: has a color palette
-                       [#"Transfer Syntax UID", and "Manufacturer" are absent.
-                         ["Modality", "OT"],
-                         ["Photometric Interpretation", "PALETTE COLOR"],
-                         ["Rows", "480"],
-                         ["Columns", "640"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1654 Length:307200"] ] ],
-               # OT-MONO2-8-colon is not present in the test suite since it is too
-               #    closely related to OT-MONO2-8-a7 to be of interest.
-               ["OT-MONO2-8-a7.dcm",
-                       [#"Transfer Syntax UID" is absent.
-                         ["Modality", "OT"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Philips Medical Systems"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:438 Length:262144"] ] ],
-               ####################################
-               # US (Ultra Sound) modality examples:
-               ####################################
-               ["US-RGB-8-esopecho.dcm",
-                       # Interest: RGB image
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"],  # Exp VR, LE
-                         ["Modality", "US"],
-                         ["Photometric Interpretation", "RGB"],
-                         ["Rows", "120"],
-                         ["Columns", "256"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Acme Products"],
-                       # FIXME: 92160 / (120*256) = 3 bytes per pixel NOT 1. Maybe
-                       # it has something to do with [Samples Per Pixel] = [3] ???
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:904 Length:92160"] ] ],
-               ["US-RGB-8-epicard.dcm",
-                       # Interest: Big endian transfert syntax
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.2"],  # Big endian
-                         ["Modality", "US"],
-                         ["Photometric Interpretation", "RGB"],
-                         ["Rows", "480"],
-                         ["Columns", "640"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "G.E. Medical Systems"],
-                         ["Manufacturer Model Name", "LOGIQ 700"],
-                       # FIXME: 921600/(480*640) = 3 bytes per pixel NOT 1. Maybe
-                       # it has something to do with [Samples Per Pixel] = [3] ???
-                         ["Implementation Version Name", "OFFIS-DCMTK-311"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1012 Length:921600"] ] ],
-       ]
-
-       MultiFrameFiles = [
-       # The number of images is contained in the "Number of Frames" element
-               ["MR-MONO2-8-16x-heart.dcm",
-                       # Interest: multi-frame
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # ExpVR, LE
-                         ["Number of Frames", "16"],
-                         ["Modality", "MR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "256"],
-                         ["Columns", "256"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Philips"],
-                         # Note: 256*256*16=1048576 (16 is the number of Frames) 
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:920 Length:1048576"] ] ],
-               ["NM-MONO2-16-13x-heart.dcm",
-                       # Interest: NM modality, multi-frame
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # ExpVR, LE
-                         ["Number of Frames", "13"],
-                         ["Modality", "NM"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "64"],
-                         ["Columns", "64"],
-                         ["Bits Stored", "16"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "15"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "ACME Products"],
-                         # Note: 64*64*13*2=106496
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1234 Length:106496"] ] ],
-               ["US-MONO2-8-8x-execho.dcm",
-                       # Interest: multi-frame
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # ExpVR, LE
-                         ["Number of Frames", "8"],
-                         ["Modality", "US"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "120"],
-                         ["Columns", "128"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Acme Products"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:976 Length:122880"] ] ],
-               ["US-PAL-8-10x-echo.dcm",
-                       # Interest: RLE (Run Length Encoded) compression, multiframe
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.5"], # RLE
-                         ["Number of Frames", "10"],
-                         ["Modality", "US"],
-                         ["Photometric Interpretation", "PALETTE COLOR"],
-                         ["Rows", "430"],
-                         ["Columns", "600"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "ACME Products"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:2428 Length:481182"] ] ],
-               ["XA-MONO2-8-12x-catheter.dcm",
-                       # Interest: XA modality, multi-frame
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"], # jpeg
-                         ["Number of Frames", "12"],  # 12 images
-                         ["Modality", "XA"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Acme Products"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1006 Length:920072"] ] ],
-       ]
-
-       GdcmFiles = [
-               ["gdcm-MR-SIEMENS-16.acr1",
-                       # Interest: good old Acr-Nema Version 1, see also Oddities below
-                       [ ["Recognition Code", "ACR-NEMA 1.0"],
-                         ["Modality", "MR"],
-                         ["Rows", "256"],
-                         ["Columns", "256"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "SIEMENS"],
-                         ["Manufacturer Model Name", "GBS III"],
-                       # FIXME: this image looks padded at the end. The length of the file
-                       # is 140288. Notice that, 256*256*2 + 1024 = 131072 + 1024 = 132096
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:8192 Length:132096"],
-                         # Oddities: "Study ID" and "Series Number" are empty
-                         ["Study ID", ""],
-                         ["Series Number", ""] ] ],
-                         # Oddities: "Study" and "Serie Instance UID" are not present
-               ["gdcm-MR-SIEMENS-16.acr2",
-                       # Interest: Acr-Nema Version 2
-                       [ ["Recognition Code", "ACR-NEMA 2.0"],
-                         ["Modality", "MR"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "SIEMENS"],
-                         ["Manufacturer Model Name", "MAGNETOM VISION"],
-                         ["Study Instance UID",
-                          "1.3.12.2.1107.5.2.4.7630.20000918174641000"],
-                         ["Study ID", "1"],
-                         ["Series Instance UID",
-                          "1.3.12.2.1107.5.2.4.7630.20000918175714000007"],
-                         ["Series Number", "7"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:6052 Length:524288"] ] ],
-               ["gdcm-US-ALOKA-16.dcm",
-                       # Interest: - possesses 3 LUTS: a Green (checked), a Red and BLue.
-                       #           - announced as implicit VR, but really explicit VR.
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2"],  # Implicit VR, LE
-                         ["Modality", "US"],
-                         ["Photometric Interpretation", "PALETTE COLOR"],
-                         ["Segmented Green Palette Color LUT Data",
-                          "gdcm::NotLoaded. Address:89576 Length:113784"],
-                         ["Rows", "480"],
-                         ["Columns", "640"],
-                         ["Bits Stored", "16"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "15"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "ALOKA CO., LTD."],
-                         ["Manufacturer Model Name", "SSD-4000"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:258740 Length:614400"] ] ],
-               ["gdcm-MR-PHILIPS-16.dcm",
-                       # Interest: - possesses a sequence
-                       #           - dicom file, with a recognition code of ACR-NEMA1
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2"],  # Implicit VR, LE
-                         ["Recognition Code", "ACR-NEMA 1.0"],
-                         ["Modality", "MR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "256"],
-                         ["Columns", "256"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Philips Medical Systems"],
-                         ["Manufacturer Model Name", "Gyroscan Intera"],
-                         ["Sequence Variant", "OTHER"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:6584 Length:131072"] ] ],
-               ["gdcm-MR-PHILIPS-16-NonRectPix.dcm",
-                       # Interest: - pixels are non rectangular
-                       #           - private elements are in explicit VR (which is normal)
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"],  # Explicit VR, LE
-                         ["Modality", "MR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "64"],
-                         ["Columns", "160"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Philips Medical Systems"],
-                         ["Manufacturer Model Name", "Gyroscan Intera"],
-                         ["Pixel Spacing", "0.487416\\0.194966"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:5010 Length:20480"] ] ],
-               ["gdcm-CR-DCMTK-16-NonSamplePerPix.dcm",
-                       # Interest: - Misses the "Samples Per Pixel" element which prevents
-                  #             e-film from reading it.
-                       #           - Misses the Manufacturer related info
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"],  # Explicit VR, LE
-                         ["Modality", "CR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "750"],
-                         ["Columns", "750"],
-                         ["Bits Stored", "8"],
-                         ["Bits Allocated", "8"],
-                         ["High Bit", "7"],
-                         ["Pixel Representation", "0"],
-                         ["Implementation Version Name", "OFFIS_DCMTK_341"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:740 Length:562500"] ] ],
-       ]
-
-       GdcmJpegFiles = [
-               ["gdcm-JPEG-Extended.dcm",
-                       # Interest: Jpeg compression [Extended (2,4)]
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.51"],
-                         ["Modality", "CT"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "SIEMENS"],
-                         ["Manufacturer Model Name", "Volume Zoom"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:2946 Length:192218"] ] ],
-               ["MR-MONO2-12-shoulder.dcm",
-                       # Interest: Jpeg compression [Lossless, non-hierar. (14)]
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.57"],
-                         ["Modality", "MR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "1024"],
-                         ["Columns", "1024"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Philips Medical Systems"],
-                         ["Manufacturer Model Name", "Gyroscan NT"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:1580 Length:718948"] ] ],
-               ["gdcm-JPEG-LossLess3a.dcm",
-                       # Interest: - Jpeg compression [Lossless, hierar., first-order
-                       #             pred. 14, Select. Val. 1]
-                       #           - contains a sequence [circa (0008,2112)]
-                       #           - contains additional data after the pixels ???
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"],
-                         ["Modality", "CT"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "512"],
-                         ["Columns", "512"],
-                         ["Bits Stored", "12"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "11"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "SIEMENS"],
-                         ["Manufacturer Model Name", "Volume Zoom"] ] ],
-                       # FIXME: the pixel data looks like corrupted. As stated by "od -A d -c"
-                       #   0002528     à 177 020 \0  O  B \0 \0   ÿ  ÿ   ÿ   ÿ  þ  ÿ \0  à
-                       #   0002544    \0  \0  \0 \0  þ  ÿ \0  à 202  ? 003  \0  ÿ  Ø  ÿ  Ã
-                       # which we interpret as follows:
-                       #   - 2528: (à 177, 020 \0) = (0x7fe0, 0x0010) i.e. Pixel Data tag,
-                       #   - 2532: OB i.e. encapsulated encoded Pixel Data,
-                       #   - 2534: Two bytes reserved,
-                       #   - 2536: ÿ ÿ ÿ ÿ = 0xffffffff i.e. data element length is undefined.
-                       #   - 2540: (þ ÿ, \0 à) = (0xfffe, 0xe000) i.e. basic offset table
-                       #           item tag
-                       #   - 2544: \0 \0 \0 \0 i.e. offset table as length zero, i.e. no
-                       #           item value for offset table.
-                       #   - 2548: (þ ÿ, \0 à) = (0xfffe, 0xe000) i.e. item tag of first
-                       #           fragment of (encoded) pixel data.
-                       #   - 2552: 202 ? 003 \0 = 212866 bytes i.e. length of first fragment
-                       #           of (encoded) pixel data.
-                       # and so the next item tag should be found at the 2556+212866 th
-                       # octet i.e. at address 215422. But, as stated by od, we find:
-                       #   0215408   E   u Ö 026   Î   É 7 ¬ Ã ¸ ó ¿ ÿ Ù \f °
-                       #   0215424   ¶ 016 P   Ñ 002 016
-                       # and (\f °, ¶ 016) is NOT an OB item TAG which is required to be
-                       # present (at least there should be a sequence delimiter), refer to
-                       # PS 3.5-2001 page 50. 
-               ["gdcm-JPEG-LossLess3b.dcm",
-                       # Interest: - Jpeg compression [Lossless, hierar., first-order
-                       #             pred. 14, Select. Val. 1]
-                       #           - encoding is sligthly different from LossLess3a.dcm ???
-                       [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"],
-                         ["Modality", "CR"],
-                         ["Photometric Interpretation", "MONOCHROME2"],
-                         ["Rows", "2076"],
-                         ["Columns", "1876"],
-                         ["Bits Stored", "15"],
-                         ["Bits Allocated", "16"],
-                         ["High Bit", "14"],
-                         ["Pixel Representation", "0"],
-                         ["Manufacturer", "Philips Medical Systems"],
-                         ["Manufacturer Model Name", "Cassette Holder Type 9840 500 35201"],
-                         ["7fe0|0010", "gdcm::NotLoaded. Address:3144 Length:4795668"] ] ],
-       ]
-
-       def _BaseTest(self, FileSet):
-               for entry in FileSet:
-                       fileName = os.path.join(GDCM_DATA_PATH, entry[0])
-                       toRead = gdcmHeader(fileName)
-                       toRead.LoadElements()
-                       valDict = toRead.GetPubElVal()
-                       for subEntry in entry[1]:
-                               element = subEntry[0]
-                               value   = subEntry[1]
-                               self.assertEqual(valDict[element], value, 
-                                                ("Wrong %s for file %s (got %s, shoud be %s)"
-                                                  % (element,fileName, valDict[element], value)) )
-
-       def testBarre(self):
-               gdcmTestCase._BaseTest(self, gdcmTestCase.BarreFiles)
-
-       def testMultiFram(self):
-               gdcmTestCase._BaseTest(self, gdcmTestCase.MultiFrameFiles)
-
-       def testFiles(self):
-               gdcmTestCase._BaseTest(self, gdcmTestCase.GdcmFiles)
-
-       def testJpeg(self):
-               gdcmTestCase._BaseTest(self, gdcmTestCase.GdcmJpegFiles)
-
-if __name__ == '__main__':
-       unittest.main()
-

diff --git a/gdcmPython/win32/gdcmpy.dsp b/gdcmPython/win32/gdcmpy.dsp
deleted file mode 100644 (file)
index 9474b69..0000000
--- a/gdcmPython/win32/gdcmpy.dsp
+++ /dev/null
@@ -1,146 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gdcmpy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=gdcmpy - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gdcmpy.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gdcmpy.mak" CFG="gdcmpy - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gdcmpy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdcmpy - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gdcmpy - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPY_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "c:\creatis\python21\include" /I "..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPY_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   Wsock32.lib  c:/creatis/python21/libs/python21.lib /nologo /dll /machine:I386 /out:"../_gdcm.dll"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy gdcm.py ..\*.*
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gdcmpy - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPY_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "c:\creatis\python21\include" /I "..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPY_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   Wsock32.lib  c:/creatis/python21/libs/python21_d.lib /nologo /dll /debug /machine:I386 /out:"../_gdcm_d.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gdcmpy - Win32 Release"
-# Name "gdcmpy - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\gdcm.i
-
-!IF  "$(CFG)" == "gdcmpy - Win32 Release"
-
-# Begin Custom Build
-ProjDir=.
-InputPath=..\gdcm.i
-InputName=gdcm
-
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       C:\creatis\SWIG-1.3.16\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gdcmpy - Win32 Debug"
-
-# Begin Custom Build - C:\creatis\SWIG-1.3.16\swig -python -c++ -I ..\..\src -o $(ProjDir)\$(InputName)_wrap.c $(InputPath)
-ProjDir=.
-InputPath=..\gdcm.i
-InputName=gdcm
-
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       C:\creatis\SWIG-1.3.16\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gdcm_wrap.cxx
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\src\win32\gdcmdll\Release\gdcmdll.lib
-# End Source File
-# End Target
-# End Project

diff --git a/gdcmPython/win32/gdcmpycomplet.dsp b/gdcmPython/win32/gdcmpycomplet.dsp
deleted file mode 100644 (file)
index 76d2bda..0000000
--- a/gdcmPython/win32/gdcmpycomplet.dsp
+++ /dev/null
@@ -1,174 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gdcmpycomplet" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=gdcmpycomplet - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "gdcmpycomplet.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "gdcmpycomplet.mak" CFG="gdcmpycomplet - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "gdcmpycomplet - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "gdcmpycomplet - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "gdcmpycomplet - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gdcmpycomplet___Win32_Release"\r
-# PROP BASE Intermediate_Dir "gdcmpycomplet___Win32_Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "gdcmpycomplet___Win32_Release"\r
-# PROP Intermediate_Dir "gdcmpycomplet___Win32_Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYCOMPLET_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /w /W0 /GX /O2 /I "c:\creatis\python21\include" /I "..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYCOMPLET_EXPORTS" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x40c /d "NDEBUG"\r
-# ADD RSC /l 0x40c /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   Wsock32.lib  c:/creatis/python21/libs/python21.lib /nologo /dll /machine:I386 /out:"../_gdcm.dll"\r
-\r
-!ELSEIF  "$(CFG)" == "gdcmpycomplet - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "gdcmpycomplet___Win32_Debug"\r
-# PROP BASE Intermediate_Dir "gdcmpycomplet___Win32_Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "gdcmpycomplet___Win32_Debug"\r
-# PROP Intermediate_Dir "gdcmpycomplet___Win32_Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYCOMPLET_EXPORTS" /YX /FD /GZ  /c\r
-# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "c:\creatis\python21\include" /I "..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYCOMPLET_EXPORTS" /YX /FD /GZ  /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x40c /d "_DEBUG"\r
-# ADD RSC /l 0x40c /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   Wsock32.lib  c:/creatis/python21/libs/python21_d.lib /nologo /dll /debug /machine:I386 /out:"../_gdcm_d.dll" /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "gdcmpycomplet - Win32 Release"\r
-# Name "gdcmpycomplet - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=..\gdcm.i\r
-\r
-!IF  "$(CFG)" == "gdcmpycomplet - Win32 Release"\r
-\r
-# Begin Custom Build\r
-ProjDir=.\r
-InputPath=..\gdcm.i\r
-InputName=gdcm\r
-\r
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       C:\creatis\SWIG-1.3.16\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "gdcmpycomplet - Win32 Debug"\r
-\r
-# Begin Custom Build - C:\creatis\SWIG-1.3.16\swig -python -c++ -I ..\..\src -o $(ProjDir)\$(InputName)_wrap.c $(InputPath)\r
-ProjDir=.\r
-InputPath=..\gdcm.i\r
-InputName=gdcm\r
-\r
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       C:\creatis\SWIG-1.3.16\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
-\r
-# End Custom Build\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gdcm_wrap.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmDict.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmDictEntry.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmDictSet.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmElValSet.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmElValue.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmFile.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmHeader.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmHeaderIdo.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\gdcmUtil.cxx\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/setup.py b/setup.py
deleted file mode 100644 (file)
index 983c54f..0000000
--- a/setup.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from distutils.core import setup
-import glob, os, sys
-from distutilsSwigCPlusPlus import *
-
-PythonIncludes=os.path.join(sys.exec_prefix, 'include')
-PythonIncludes=os.path.join(PythonIncludes, 'python' + sys.version[:3])
-
-ThisModule='gdcmPython'
-
-gdcmSrcDir="src"
-gdcmPythonSrcDir=ThisModule
-
-# Due to a disutil oddity on Unices : see
-# http://aspn.activestate.com/ASPN/Mail/Message/distutils-sig/588325
-if(os.name=='posix'):
-       targetDir=os.path.join('lib', 'python' + sys.version[:3])
-       targetDir=os.path.join(targetDir, 'site-packages')
-       ExtraPath=ThisModule
-else:
-       targetDir='Lib'
-       ExtraPath=os.path.join(targetDir,ThisModule)
-
-targetDir=os.path.join(targetDir, ThisModule)
-
-setup(name=ThisModule,
-      version="0.1",
-      description="...",
-      author="frog",
-      author_email="frog@creatis.insa-lyon.fr",
-      url="http://www.creatis.insa-lyon.fr/",
-      packages=[ gdcmPythonSrcDir,
-                 gdcmPythonSrcDir + '.demo',
-               ],
-      #package_dir={'':'python'},
-      #extra_path = "zob",
-      cmdclass={'build_ext':mybuild_ext}, # redirects default build_ext
-      ext_modules=[MyExtension(
-                   name='_gdcm',
-                   sources=[os.path.join(gdcmSrcDir, "gdcmDict.cxx"),
-                            os.path.join(gdcmSrcDir, "gdcmDictEntry.cxx"),
-                            os.path.join(gdcmSrcDir, "gdcmDictSet.cxx"),
-                            os.path.join(gdcmSrcDir, "gdcmElValSet.cxx"),
-                            os.path.join(gdcmSrcDir, "gdcmElValue.cxx"),
-                            os.path.join(gdcmSrcDir, "gdcmFile.cxx"),
-                            os.path.join(gdcmSrcDir, "gdcmHeader.cxx"),
-                            os.path.join(gdcmSrcDir, "gdcmUtil.cxx"),
-                            os.path.join(gdcmPythonSrcDir, "gdcm.i")],
-                   include_dirs=[gdcmSrcDir, PythonIncludes],
-                   libraries=["stdc++"],
-                   #library_dirs=[VTK_LIB_DIR],
-                   swig_cpp=1,
-                   swig_include=[gdcmSrcDir] ) ],
-      data_files=[(os.path.join(targetDir,"Data"),
-                   glob.glob(os.path.join("Data","*.*"))),
-                  (os.path.join(targetDir,"Dicts"),
-                   glob.glob(os.path.join("Dicts","*.*"))),
-                ]
-     )