X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=fb43af6536774fc63c223dcb76a1e5fc102d9798;hb=494aa96ecf94b849d344c999bfb061efbd942c87;hp=dfcbddf725cb8616a7a08f6b360a12688daca9ef;hpb=f2f8346cbd0d29520da693ebce9e54df0f7dcbc7;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index dfcbddf7..fb43af65 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2005/07/07 17:55:08 $ - Version: $Revision: 1.69 $ + Date: $Date: 2005/10/11 08:24:10 $ + Version: $Revision: 1.93 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -54,9 +54,10 @@ // Old system only have this #include // For uint8_t uint16_t and uint32_t #else -// Broken plateform do not respect C99 and do not provide those typedef -// Special case for recent borland compiler, comes with stdint.h -#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) +// Broken plateforms do not respect C99 and do not provide those typedef +// Special case for recent Borland compiler, comes with stdint.h +#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) \ + || defined(__MINGW32__) typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; @@ -85,7 +86,20 @@ typedef unsigned int uint32_t; #endif #include +#define FASTTAGKEY 0 +// FIXME: Should rewrite this: +#if FASTTAGKEY +#include +#include +#endif +#if defined(_MSC_VER) && (_MSC_VER == 1200) +/* ostream operator for std::string since VS6 does not provide it*/ +#include +#endif + + +//----------------------------------------------------------------------------- /// \brief namespace for Grass root DiCoM namespace gdcm { @@ -106,37 +120,60 @@ GDCM_EXPORT extern const std::string GDCM_UNFOUND; GDCM_EXPORT extern const std::string GDCM_BINLOADED; GDCM_EXPORT extern const std::string GDCM_NOTLOADED; GDCM_EXPORT extern const std::string GDCM_UNREAD; +GDCM_EXPORT extern const std::string GDCM_NOTASCII; +GDCM_EXPORT extern const std::string GDCM_PIXELDATA; +/// \brief TagKey is made to hold the standard Dicom Tag +/// (Group number, Element number) +/// Instead of using the two '16 bits integers' as the Hask Table key, we +/// converted into a string (e.g. 0x0018,0x0050 converted into "0018|0050") +/// It appears to be a huge waste of time. +/// We'll fix the mess up -without any change in the API- as soon as the bench +/// marks are fully performed. -/// \brief TagKey is made to hold an "universal" (as in URL, Universal -/// Ressource Locator) key to a DocEntry i.e. a dicom tag. -/// A dicom tag always has a group and an elem, but a set of tags -/// embeded in various (optionally nested) sequences and sharing -/// the same group and elem all share the same (group, elem) -/// "identifier". Hence the (group, elem) cannot be used as an -/// identifier (in gdcm we shall refer to a "TagKey") of a tag. -/// In order to construct a proper tag identifier (i.e. a key) we -/// consider the following definition of a TagKey: -/// - let Group, Element be the string representation of the -/// group and elem dicom tag members, -/// - let ItemNumber be the string representation of the integer -/// index of the considered item number of a sequence, -/// Let the key of a tag embeded in a sequence, noted SeqTag, be -/// the form: -/// /ItemNumber#Group|Element -/// where "/", "#" and "|" are characters acting as separators. -/// Then the general form of a TagKey is given by: -/// Group|Element[SeqTag] -/// where [SeqTag] means NO or many instances of SeqTag. -/// Hence the TagKey of a tag not "leaving" in a sequence is the -/// string e.g. -/// 0028|1201 -/// but the TagKey of a tag "embeded" is the first item of -/// a sequence, itself nested in the third item of a sequence is the -/// string e.g. -/// 0004|1220/2#0008|0082/0#0008|0090 +#if FASTTAGKEY +typedef union { + uint16_t tab[2]; + uint32_t tagkey; + } TagKey; +/* ostream operator for TagKey */ +inline std::ostream& operator<<(std::ostream& _O, TagKey _val) +{ + _O.setf( std::ios::right); + return (_O << std::hex << std::setw( 4 ) << std::setfill( '0' ) + << _val.tab[0] << '|' << std::setw( 4 ) << std::setfill( '0' ) + << _val.tab[1] << std::setfill( ' ' ) << std::dec); +} +inline bool operator==(TagKey _self, TagKey _val) +{ + return _self.tagkey == _val.tagkey; +} +inline bool operator<(TagKey _self, TagKey _val) +{ + // This expression is a tad faster but PrintFile output + // is more difficult to read + //return _self.tagkey < _val.tagkey; + + // More usal order of dicom tags: + if( _self.tab[0] == _val.tab[0] ) + return _self.tab[1] < _val.tab[1]; + return _self.tab[0] < _val.tab[0]; +} +#else typedef std::string TagKey; +#endif +#if defined(_MSC_VER) && (_MSC_VER == 1200) +// Doing everything within gdcm namespace to avoid polluting 3d party software +inline std::ostream& operator<<(std::ostream& _O, std::string _val) +{ + return _O << _val.c_str(); +} +#endif + +/// \brief TagName is made to hold the 'non hexa" fields (VR, VM, Name) +/// of Dicom Entries typedef std::string TagName; +/// \brief various types of a DICOM file (for internal use only) enum FileType { Unknown = 0, ExplicitVR, // DicomDir is in this case. Except when it's ImplicitVR !... @@ -152,7 +189,29 @@ enum DicomDirType { DD_PATIENT, DD_STUDY, DD_SERIE, - DD_IMAGE + DD_IMAGE, + DD_VISIT +}; + +/// \brief comparison operators (as used in SerieHelper::AddRestriction() ) +enum CompOperators { + GDCM_EQUAL = 0, + GDCM_DIFFERENT, + GDCM_GREATER, + GDCM_GREATEROREQUAL, + GDCM_LESS, + GDCM_LESSOREQUAL +}; + +/// \brief Loading mode +enum LodModeType +{ + LD_ALL = 0x00000000, // Load all + LD_NOSEQ = 0x00000001, // Don't load Sequences + LD_NOSHADOW = 0x00000002, // Don't load odd groups + LD_NOSHADOWSEQ = 0x00000004 // Don't load Sequences if they belong + // to an odd group + // (*exclusive* from LD_NOSEQ and LD_NOSHADOW) }; /**