* setup.py is again effective on un*x (takes into account the
addon of the jpeg library)
* Doc/DoxyDevelInstal.txt added (developper's raw documentation)
* Doc/Doxy* updated (includes above enhancements)
* INSTALL now points to web documentation --- Frog
* gdcmPython/Makefile.am now avoids calling the wrappers for the
clean target.
* src/gdcm*.[cxx|h] :
- to allow compilation with gcc 3.x
-- clean up of STL usage (added explicit usage of std::)
-- small fixes on exceptions.
Note: linking not tested !
- clean of doxygen comments to avoid warnings at documentation
building stage.
* vtk/vtkGdcmReader.cxx: g++ warning message clean up (platform
dependent convertion).
frog [Tue, 24 Jun 2003 10:09:45 +0000 (10:09 +0000)]
* Clean up of previous JPR garbage commit (not even commented in the
Changelog):
- Test/Makefile.am removed the reference to unexisting testTS.cxx
- moved all jpeg related files from src to src/jpeg/libijg8, with
addition/modification of Makefile.am and configure.in.
- the testSuite is still brain damage (not guilty).
frog [Wed, 11 Jun 2003 13:36:53 +0000 (13:36 +0000)]
* vtk/vtkGdcmReader.[cxx/h]:
- UpdateProgress method should now be effective
- removed the limitation on having only images loaded (as opposed
to volumes),
- when building a stack of images/volume, a lesser number of
gdcmHeader and gdcmFile instances should be used (hopefully
accelerating things).
- when building a stack of images/volumes, files which are not
loadable (wrong path-filename, wrong permissions on existing file,
or file not parsable by gdcm) are replaced with a black image
in the stack (for the caller to notice the problem).
regrain [Mon, 2 Jun 2003 07:42:17 +0000 (07:42 +0000)]
* vtk/vtkGdcmReader[cxx|h] : makes correct code to remove conflicts
between standard library (std) and vtk library (problems are found
under Windows... thanks Windows !)
-- BeNours
frog [Fri, 30 May 2003 18:48:35 +0000 (18:48 +0000)]
* vtk/vtkGdcmReader[cxx|h] should now be volume aware (read ready for
debug stage).
* gdcmPython/demo/vtkGdcmReader.py: commented lines for volume test
frog [Wed, 28 May 2003 19:36:20 +0000 (19:36 +0000)]
* When compiling with distutils (see setup.py) the C++ compiler is
called with different flags than the default ones (with automake).
In order to fix all those warning, I compiled gdcm with the command
make 'CXXFLAGS=-Wall -Wstrict-prototypes -D__STDC_LIMIT_MACROS'
and went for warning fixes:
- src/gdcmHeader.cxx, Test/dcm2acr.cxx, pourFindTaggs.cxx cleaned
up from unused variables.
- vtk/vtkGdcmReader.cxx: potential bug fix.
* src/gdcmHeader.h: Doxygen warning cleanup
frog [Tue, 27 May 2003 15:16:13 +0000 (15:16 +0000)]
* gdcmPython/gdcm.i:
- typemaps correction to take into account the systematic replacement
of "using namespace std" with std:: prefix e.g. std::list,
std::string... (cf changes of 2003-05-21).
- gdcmGlob global variable of type gdcmGlobal (defined in
src/gdcmUtil.cxx and declared in gdcmPython/gdcm.i) is now
exported to Python a as cvar.
* gdcmPython/__init__.py now defines two functions GetPubDictTagNames()
and GetPubDictTagNamesByCategory() as a replacement for deprecated
gdcmDictSet.GetPubDictTagNames() and
gdcmDictSet.GetPubDictTagNamesByCategory() class functions (i.e.
C++ static methods).
* gdcmPython/demo/printGroupedPublicDict.py is operational again,
with the above changes. ---- Frog
regrain [Thu, 22 May 2003 10:44:30 +0000 (10:44 +0000)]
* Modification of setup.py to compile vtk part too. Then, we have 2
wrappers which must work with same distutils. For that, we have a
generic distutils in distusiltsWrapping.py ; with :
- build_extWrap class to wrap generically all extensions,
- ExtensionWrap base class for all wrapping extension that contains
a wrapper
- Wrapper interface which wrap sources
+ In WrapSwig.py we have extension and wrapper for Swig
+ In WrapVTK.py we have extension and wrapper for VTK
* MANIFEST.in : modifications to consider vtk directory and new python
files for compilation
-- BeNours
regrain [Wed, 21 May 2003 16:26:26 +0000 (16:26 +0000)]
* src/*.[h] all occurences of stl classes are now prefixed with
std::, and all occurences of "using namespace std;" where removed.
This is to avoid pollution of global namespace in included files.
Apparently vtk does not avoid this pitfall: when using both
gdcm and vtk (as in vtk/vtkGdcmReader.cxx) this ended up in a
collision of various stl members (principally cout...).
* gdcmPython/gdcm.i now declares a typemap for std::string (to
comply with above changes)
-- Frog & BeNours
frog [Wed, 21 May 2003 14:42:45 +0000 (14:42 +0000)]
* src/*.[h] all occurences of stl classes are now prefixed with
std::, and all occurences of "using namespace std;" where removed.
This is to avoid pollution of global namespace in included files.
Apparently vtk does not avoid this pitfall: when using both
gdcm and vtk (as in vtk/vtkGdcmReader.cxx) this ended up in a
collision of various stl members (principally cout...).
frog [Wed, 21 May 2003 08:21:16 +0000 (08:21 +0000)]
* Added python wrappers of vtkGdcmReader vtk class (see the
source in vtk/vtkGdcmReader.cxx) :
- vtk/Makefile.am now builds a library
- gdcmPython/Makefile.am now builds vtkgdcmPython a second import
python library (as opposed to _gdcm.so wich are the python
wrappers of gdcm). vtkgdcmPython.so uses the vtk python wrappers
(vtkWrapPython and vtkWrapPythonInit utility) to build vtkgdcmPython
import library.
- configure.in has an additional flag --enable-vtk that needs
to be set to enable compilation of vtk related code, that is:
+ vtk/vtkGdcmReader.so and
+ vtk/testvtkGdcmReader C++ demo of vtk wrappers of gdcm)
+ gdcmPython/vtkgdcmPython.so (see above)
- gdcmPython/demo/vtkGdcmDemo.py corrected (some images cannot
be read when compressed or when HighBit + 1 != BitsStored),
- gdcmPython/demo/vtkGdcmReader.py added. This demo illustrates
the usage of the python wrapper of vtkGdcmReader vtk class.
* vtk/vtkGdcmReader.cxx: bug fixed (thanks to Benoit Regrain).
frog [Mon, 12 May 2003 14:32:42 +0000 (14:32 +0000)]
* src/gdcmHeader>[h/cxx] added gdcmHeader::GetPixelSize()
* vtk/vtkGdcmReader.cxx now properly inports the image in the
vtk data structure (an image Flip was required).
* vtk/testvtkGdcmReader.cxx refers to gdcmData subdir instead of Data.
* cosmetic changes in documentation.
frog [Wed, 7 May 2003 13:21:49 +0000 (13:21 +0000)]
* The subdirectory Data (containing all the images used for the
test suite) is not part of this repository anymore. A new module
containing those images is now available at
:pserver:xxx@cvs.creatis.insa-lyon.fr:2402/cvs/public
with the name gdcmData.
All the python scripts (including the package initialisation file
gdcmPython/__init__.py) were adapated to take this change into
account (basically GDCM_DATA_PATH is now GDCM_TEST_DATA_PATH).
frog [Mon, 5 May 2003 14:13:58 +0000 (14:13 +0000)]
* vtk subdir added. Contains vtkGdcmReader.[cxx|h] a vtk class
inherinting from vtkImageReader and testvtkGdcmReader.cxx a small
demo of the usage of this class.
Compilation of this vtk part is only done when using the --enable-vtk
at configure (or autogen.sh) stage.
UML design file added. This file contains a class diagram that shows the
actual state of the project. Some work has to be done in order to:
- Eliminate relationship cycles, if possible.
- Separate classes in packages.
- Include all existing documentation.
- Do a software engineering process to discover the package's real behaviour
Vs its desired behaviour. Ideally, this difference should be 0.
* More memmory link related corrections and documentation fixes.
Notes on valgrind:
- maximum info is obtained with a command of the form:
valgrind --leak-check=yes --leak-resolution=high --num-callers=40
--show-reachable=yes PrintHeader
- the remaining reachable blocks seem to come from the STL
allocation scheme through the usage of map and list. It looks
like this memory cannot be freed but it is not a memory leak
(in fact further invocation to the STL would recollect the
unused memory allthough it cannot explicitely be freed).
* gdcmPython/demo/vtkGdcmDemo.py added: this is a small demo
of displaying an image parsed with gdcm and displayed with VTK.
Note: some images don't seem to work e.g.
python vtkGdcmDemo.py ../../Data/US-RGB-8-esopecho.dcm
* src/gdcmHeader.x: dicom_vr and Dicts are not class members anymore.
Allthough this weakens the semantics, it is a ditch attempt to
make gdcm more thread friendly. --- Frog
* Memory link hunt (by using valgrind --leak-check=yes PrintHeader).
- added src/gdcmVR.cxx gdcmVR.h that objectify the previous
gdcmHeader::_dicom_vr.
- gdcmHeader::InitVRDict transfered as gdcmVR::gdcmVR().
- gdcmHeader::dicom_vr is now of type gdcmVR* as opposed to
VRHT*.
- gdcmGlobal global object contained class added (see src/gdcmUtil.x)
Correction calcul 'gdcmZSize' dans AddAndDefaultElements.
Question : Utilité d'une telle fonction, qui ajoute des Elements non ACR/DICOM dans le PubElValSet
(problèmes lors du DCM Write à prévoir)
--> A remplacer par des accesseurs propres ?
frog [Mon, 31 Mar 2003 12:02:26 +0000 (12:02 +0000)]
* src/gdcmHeader.h: LoadElements() is not a public method anymore
(to avoid double call by end user).
* Test/*.cxx LoadElements() doesn't need to be called explicitely
by end user, since gdcmHeader::gdcmHeader now handles it. --- Frog
frog [Sat, 29 Mar 2003 17:21:48 +0000 (17:21 +0000)]
* gdcm/Doc many doxygen changes:
- Doxyfile now has two different versions, DoxyfileUsers that generates
the html.users end users oriented documentation and
DoxyfileDeveloppers that generates the html.developper developper
oriented documentation.
- README changed accordingly
- requirement.txt removed (old design info moved to TODO).
- Additional files DoxyInstallation.txt, DoxyIntroduction.txt,
DoxyMainPage.txt, DoxyPython.txt provide more information.
- Note: the website http://www.creatis.insa-lyon.fr/Public/Gdcm/ can now
be updated by simply regenerating the docs with doxygen and copying
html.developper and html.users to tux:/home/httpd/html/Public/Gdcm
* src/gdcmElValSet.cxx: stl <map>.count() can only return 0 or 1.
Hence all the tests in the form "if (<map>.count() >1)" were removed.
* src/gdcmFile.cxx: cosmetic changes to avoid messages of doxygen about
ill-formed documentation sections.
* src/gdcmHeader.cxx: ditto --- Frog
frog [Thu, 27 Mar 2003 14:57:07 +0000 (14:57 +0000)]
* setup.py fixed for un*x (needed macro for stdint.h)
* Test/test.cxx renamed to PrintHeader.cxx to avoid collision on
un*ces with sh-utils test utility.
* gdcmPython/demo/test.py renamed to PrintHeader.py
* gdcmPython/demo/ReorganiseFiles.py new demo script added.
frog [Tue, 25 Mar 2003 11:41:16 +0000 (11:41 +0000)]
* gdcmPython/Makefile.am fixed linking against libstdc++
* gdcmPython/_gdcm.so symbolic link to gdcmPython/.libs/pygdcm.so added.
* Swig subdir (historical tests of swig version 1.3.17++) removed
* Test/testChangeEntete.cxx some lines commented out in order to make
compilation work.
* src/gdcmHeader.cxx cleaned up wild JPR's dirty kludge.
* src/gdcmElValSet.cxx cleaned up frog's forgotten debug message
frog [Mon, 24 Mar 2003 13:11:23 +0000 (13:11 +0000)]
* src/gdcmHeader.cxx gdcmHeader::gdcmHeader now calls LoadElements(),
hence the user doesn't need this explicit call.
- gdcmPython/testSuite.py, gdcmPython/demo/*.py changed accordingly
i.e. LoadElements() call removed.
* src/gdcmCommon.h now defines UINT32_MAX (see stdint.h).
- src/Makefile.am declares the proper flag for g++.
* src/gdcmElValSet.h added gdcmElValSet::GenerateFreeTagKeyInGroup
for adding user defined new tags.
- src/gdcmHeader.cxx gdcmHeader::NewManualElValToPubDict added.
- src/gdcmHeader.cxx gdcmHeader::AddAndDefaultElements now
cleanly adds some gdcm added tags (like gdcmXSize, gdcmYSize...)
bellet [Mon, 17 Mar 2003 14:44:55 +0000 (14:44 +0000)]
2003-03-17 Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>
* Makefile.am, acinclude.m4, configure.in, python.m4, Dicts/Makefile.am,
Doc/Makefile.am, Test/Makefile.am, gdcmPython/Makefile.am,
src/Makefile.am : the project should properly compile and install
with the autotools, included the python wrappers part.
* gdcm.spec.in : added a spec file for RPM packaging.
jpr [Fri, 14 Mar 2003 14:26:01 +0000 (14:26 +0000)]
Pricipe de precaution : j'inhibe le recalcul des longueur des groupes
dans WriteDcm et WriteAcr
Ca ne sera pas génant pour les *vrais* DICOM Readers.
Ca *pourra* l'etre pour des ACR Readers un peu teigneux ...
frog [Wed, 12 Mar 2003 23:38:58 +0000 (23:38 +0000)]
* gdcmPython/__init__.py fix of GDCM_DICT_PATH which was not
to exported to the environement (see gdcmPython/testSuite.py
for usage).
* src/gdcmElValSet.cxx, src/gdcmUtil.[cxx-h] Tokenize utility function
moved away from gdcmElValSet.cxx to gdcmUtil.cxx.
frog [Wed, 12 Mar 2003 21:33:19 +0000 (21:33 +0000)]
* src/gdcmElValSet.[cxx/h], gdcmElValue.[cxx/h], gdcmFile.[cxx/h],
gdcmHeader.[cxx/h]: ElValSet class renamed to gdcmElValSet, and
ElValue class renamed to gdcmElValue for obvious consistency reasons.
jpr [Wed, 12 Mar 2003 13:09:00 +0000 (13:09 +0000)]
POur traiter certaines (?) images Philips pour lesquelles le File Preamble
est suivi de l'elem (0002,0001) et non pas de l'elem (0002,0000)
-pas d'autre possibilité envisageable ...-
Peut-etre
frog [Mon, 10 Mar 2003 10:16:40 +0000 (10:16 +0000)]
* gdcmPython/__init__.py doesn't crash anymore when running in
in InstallMode or PreInstallMode but with an environement given
value of GDCM_DICT_PATH.
* src/gdcmDictSet.[cxx/h] coding style. --- Frog
frog [Thu, 6 Mar 2003 14:04:34 +0000 (14:04 +0000)]
* src/gdcmHeader.h and gdcmHeader.cxx Coding style + doxigenation.
* src/gdcm.h general comments moved to TODO, and README
* src/gdcm.h should now be seen as a user commodity (including it
should suffice to fully use gdcm). It is nowhere including within
any of the kernel files src/*.cxx and src/*.h.
frog [Wed, 5 Mar 2003 14:55:49 +0000 (14:55 +0000)]
* src/gdcm.h splitted in gdcmCommon.h, gdcmDict.h, gdcmDictEntry.h,
gdcmDictSet.h, gdcmElValSet.h, gdcmElValue.h, gdcmFile.h,
gdcmHeader.h
* src/gdcm*.cxx only include their corresponding include file
(as opposed to gdcm.h)
* gdcmPython/gdcm.i changed accordingly
* Test/Makefile.am corrected and added NEWS, AUTHORS in order for
the autogen.sh generated "make snapshot" command to work.
* autogen.sh removed history related references to crea package.
frog [Mon, 3 Mar 2003 17:56:21 +0000 (17:56 +0000)]
* Eventually, python/gdcmPython was renamed to gdcmPython. This
was done in a last ditch attempt to get setup.py _really_
operationnal. The python/gdcmPython layaout add the advantage
of hidding away the python related distutils specific files
(MANIFEST.in, setup.py, distutils*.py...) from the main directory.
Alas, the src directory was out of scope (i.e. it's relative
position to setup.py was ../src) which made things impossible to
handle (see previous version of python/setup.py). Crossing fingers...
frog [Fri, 21 Feb 2003 16:00:13 +0000 (16:00 +0000)]
* python/setup.py now works on Un*x. (harder than I thougth)
* python/distutilsSwigCPlusPlus.py can now have include files
among the list of sources. --- Frog
frog [Wed, 19 Feb 2003 23:37:47 +0000 (23:37 +0000)]
* Doc/Doxyfile configuration file for Doxygen and corresponding
README file for usage added.
* Test/testWrite.cxx added. This new test comes from a split of
test.cxx that is now reverted to its original purpous i.e.
testing the proper parsing of a Dicom related file.
testWrite.cxx concentrates on testing the IO part of gdcm.
* Test/bug1.cxx (containing a bug on WIn32) added.
* src/gdcm.h, gdcmHeader.cxx, gdcmDictSet.cxx:
- gdcmHeader::GetPubTagNames and gdcmHeader::GetPubTagNamesByCategory
whose purpose is to publish the content of the TagNames of the
Dicom public dictionnary were not accessible without an
instance of class gdcmHeader.
- those methods are now static methods of gdcmDictSet and hence
require no instances at all to be invocated.
- within gdcmDictSet this change required to change some method
to class methods (i.e. are now static) among which SetDictPath
(renamed to BuildDictPath) and LoadDefaultPubDict.
* python/gdcmPython/demo/printGroupedPublicDict.py changed to illustrate
the above changes by calling the new method classes of gdcmDictSet.
* python/gdcmPython/__init__.py now exposes gdcm.gdcmDictSet for
the above to be effective.
* python/gdcmPython: in order to wrap properly the above changes
for Python, swig version now needs to be > 1.3.17.
* python/gdcmPython/Makefile fixed to adapt itself to new
configure/make shema introduced by Johan Montagnat (thanks for the
contribution). Alas this Makefile cannot be turned into a proper
Makefile.am without some heavy changes in the configure.in
(for python dectection).
* python/gdcmPython/gdcm.i: the out typemap map<string, list<string>>*
now avoids publishing the empty entries. --- Frog