frog [Wed, 22 Jan 2003 20:15:52 +0000 (20:15 +0000)]
* python/distutilsSwigCPlusPlus.py now properly collects the
shadow classes generated by "swig -c++" (gdcm.py in our case)
when using "python setup.py install".
* python/gdcmPython/__init__.py imports gdcm.py and only manually
reexports the working classes.
* src/gdcmHeader.cxx all the try/catch/throw calls were replaced
by the classical C errno scheme. This is to prevent an obscure
behavior of the python wrappers when importing wxPython.wx prior
to gdcmPython (which ended up in an abort call). An illustration
of this oddity can be found in the Test/ExceptionAndPython
subdir (see the README file). This problem probably due to
an combination of g++ and dynamic loading.
* added Test/ExceptionAndPython (see above) --- Frog
frog [Fri, 17 Jan 2003 10:48:13 +0000 (10:48 +0000)]
* 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
frog [Wed, 15 Jan 2003 21:48:33 +0000 (21:48 +0000)]
* gdcmPython/setup.py and distutilsSwigCPlusPlus.py added. The
distutils installer is operational.
* - gdcmPython/__init__.py now properly loads the swig generated
shadow classes (from gdcm.py).
- gdcmPython/demo/*.py changed to import the package gdcmPython
instead of gdcmPython/demo/load.py.
- gdcmPython/testSuite.py changed to import the package gdcmPython.
jpr [Tue, 14 Jan 2003 16:31:41 +0000 (16:31 +0000)]
Ajout fonction
int gdcmFile::WriteDcm (string nomFichier)
ATTENTION :
-->Elle ecrit *forcement* en IMPLICIT little Endian (si on a un processeur intel ...)
-->Elle part d'un gdcmFile *forcement* correct (aucun test de vraisemblance n'est fait)
-->Rien n'est encore prévu pour 'fabriquer' un gdcmHeader ex-nihilo
jpr [Tue, 14 Jan 2003 13:23:48 +0000 (13:23 +0000)]
Ajout fonctions
int AddNewEntry (gdcmDictEntry* NewEntry);
int ReplaceEntry(gdcmDictEntry* NewEntry);
int RemoveEntry (TagKey k);
int RemoveEntry (guint16 group, guint16 element);
jpr [Tue, 14 Jan 2003 11:56:04 +0000 (11:56 +0000)]
modifie (0028, 0005) -number of dimensions- et (0028,0200) -image location-
de VR RET pour les mettre en US
(eviter les tests épouvantables pour rien ...)
jpr [Thu, 19 Dec 2002 17:51:42 +0000 (17:51 +0000)]
Ajout de quelques Accesseurs pour la Transfert Syntax.
IsExplicitBigEndianTransfertSyntax IsJPEGSpectralSelectionTransfertSyntax, etc...
(Je ne suis pas sur que ce soit la bonne maniere dee proceder.
Il y en a VINGT-CING en tout,
J'ai craque au bout de 8 ...
Y a-t-il la possibilite de faire chose generalisable ?
frog [Mon, 16 Dec 2002 14:37:07 +0000 (14:37 +0000)]
* src/gdcm.h, src/gdcmHeader.cxx: added GetPubTagNames() resp.
GetPubTagNamesByCategory() to gdcmHeader that return a list of the
entries within the associated public Dicom dictionary resp. the same
information but sorted by the fourth field (PAT, IMG, DIR) of the
dictionary.
- Dicts/dicomV3.dic Entries which had and unspecified fourth field
are now in the "???" group.
- python/gdcm.i changed accordingly,
- python/demo/printGroupedPublicDict.py added, that gives an example
of the above new functionalities in Python. --- Frog
frog [Mon, 9 Dec 2002 08:51:35 +0000 (08:51 +0000)]
* Test/Makefile building now depends on the one of libgdcm.so
* src/gdcmHeader.cxx and gdcm.h are now OB (undefined length encoded
pixel data) aware which enables finding the address (offset) of
the pixel data of JPEG encoded DICOM files. This leaves only a single
file in the testSuite whose pixel data address (offset) is unknown.
* python/testSuite.py changed accordingly. --- Frog
yougz [Fri, 6 Dec 2002 16:03:28 +0000 (16:03 +0000)]
2002-12-6 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
* wrapping python correct with standalone wrapped dll (don't use separate
dll under windows !!!!)
* removed glib references
* typedef's inserted in gdcm.i for correct swig type management
* python21_d MODE DEBUG enabled (ask Frog how to use it)
* NO problem with having an STL member of class for example string in C++
* PYTHON TEST OF DCMLIB OK UNDER WINDOWS ON A LARGE SET (one) of IMAGE(s).
frog [Wed, 27 Nov 2002 22:28:43 +0000 (22:28 +0000)]
* python/demo/*.py load.py extracted from test.py. Added explore.py
that only displays required tags and testAll.py that parses all
the files of the testsuite without using unittest.
* python/testSuite.py other additional test on new files added.
* Data/* new test files added accordingly to the testSuite.
* src/gdcmHeader.cxx avoid overwriting of the dictionary when
the vr in the file differs from the one of the dictionary. --- Frog
frog [Wed, 20 Nov 2002 17:55:46 +0000 (17:55 +0000)]
* src/gdcm.h and gdcmHeader.cxx gdcm no longer loads all the elements
values, but limits itself to values which are below a user specified
size (by default 1024 bytes).
* python/gdcm.i : elements not loaded (because their size is above the
user specified treshold) are exported with their TagKey as key of the
python dictionary. This enables the testsuite to make some checks
on the unloaded elements (since we have their offset and size).
* python/testSuite.py
- now tests for the existence and proper value of the pixel data
- two new examples added.
* Data/gdcm-MR-SIEMENS-16.acr[12] added. --- Frog
frog [Mon, 18 Nov 2002 08:54:13 +0000 (08:54 +0000)]
* src/gdcm.h and gdcmHeader.cxx are now "Big Endian transfer syntax"
aware. See the strategy comments in gdcmHeader::FindeLength().
* Test/test.cxx now accepts a filename as first argument.
* Data/US-PAL-8-10x-echo.dcm and US-RGB-8-epicard.dcm added.
* python/testSuite.py changed to integrate test on above files. --- Frog
frog [Thu, 14 Nov 2002 14:55:20 +0000 (14:55 +0000)]
* python/testSuite.py unittest test suite added (uses Data)
* Data/* dcm and acr files for the test suite.
* glib dependance removed from un*x version. We now use ISO C99
7.18 Integer types (see stdint.h)
- python/Makefile, src/Makefile src/gdcm.h
* src/ when an explicit vr (like dicom files) suddenly poped an
implicit element we use to mark the underlying DictEntry of the
concerned ElValue with "Implicit". This strategy was damageable
too the public or provite dictionaries, since some of their vr
would be changed. Since Header::FindLength heavily relies on the
detection by Header::FindVR of falsely explicit elements, I
added an extra ImplicitVr member to ElValue (boolean).
The rest of the changes we the necessary adaptations. --- Frog
frog [Fri, 8 Nov 2002 14:07:05 +0000 (14:07 +0000)]
* Adaptation for porting to VC++:
- src/gdcm.h
o forced to use std namespace (for string to be known)
o all class use __declspec export style on WIN32
- src/gdcmUtil.cxx new Exit method that wraps the exit call
(in stdlib.h on Win32 but in std:: for gcc)
* src/gdcmDictSet::SetDictPath adds a trailing / to environement
variable GDCM_DICT_PATH.
* src/gdcmHeader.cxx verbose comments made discrete. --- Frog
frog [Thu, 7 Nov 2002 15:11:35 +0000 (15:11 +0000)]
* python/gdcm.i: added a typemap that converts a C++ hashing table
to native Python dictionary.
* python/demo/test.py:
- now uses the native dictionary for exploration of gdcmHeader.
- takes an optional filename argument (the file to parse).
* src/gdcm.h and gdcmHeader.cxx: gdcmHeader now has an accessor on
PubElVals hashing table.
* Dicts/dicomV3.dic removed error prone trailing spaces. --- Frog
frog [Wed, 6 Nov 2002 22:48:40 +0000 (22:48 +0000)]
* Python wrapping process moved away from src/Makefile to
newly created python/Makefile (as well as gdcm.i)
* python/demo/test.py (that mirrors Test/test.cxx) is effective.
* src/gdcmHeader::FindLength only looks for current vr when necessary.
* src/gdcmDictSet.cxx: the dictionnaries directory path is now imported
from the environement variable GDCM_DICT_PATH (when existing).
* src/gdcmDict::GetTag bug fix. --- Frog
frog [Thu, 31 Oct 2002 15:15:49 +0000 (15:15 +0000)]
* Straightforward temporary fixes for swig to build the python wrappers.
src/Makefile now has a python working entry [by working we mean
that we can import de shadow classes without errors]. --- Frog
frog [Tue, 29 Oct 2002 17:37:08 +0000 (17:37 +0000)]
* src/gdcmHeader.cxx :
- Parsing of header is now separated from loading of element values
(see gdcmHeader::LoadElements).
- general clean up of hopefully all file access (creation of
ReadInt16 and ReadInt32) --- Frog
frog [Tue, 22 Oct 2002 14:10:49 +0000 (14:10 +0000)]
* src/gdcmHeader.cxx :
- RecupLgr renamed to FindLength and cut off with new IsAnInteger
method.
- SetLgrElem renamed to SetLength
- GetLgrElem renamed to GetLength
- ~gdcmHeader() made virtual to pesky warning messages at compile.
* src/gdcmElValSet.cxx fixed both GetElValue methods
* Dicts/dicomV3.dic falacious entry [7fe0 0010 OT PXL Pixel Data]
due to IdoDude was cleaned out. --- Frog
frog [Mon, 21 Oct 2002 10:29:42 +0000 (10:29 +0000)]
* src/gdcmHeader.cxx RecupLgr split in FindVR and RecupLgr. FindVR
concentrates on finding the value representation (when it exists).
RecupLgr now only finds the element value length, and it avoids
returning the unecessary skL (skipped length).
Also, offsetCourant was simply removed (with taille_fich) since
it was redundant with the File position internals (by using
ftell and fseek). This also made skL (see above in RecupLgr) usage
jajun.
* src/gdcmHeaderIdo.cxx src/gdcmIdo.h added. Those files concentrate
on the libido specificities which are handled through class
inheritance.
* Test/implicit_vr.dcm dicom v3 in implicit value representation
added. --- Frog