X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=fb43af6536774fc63c223dcb76a1e5fc102d9798;hb=bc69950a406d06c50f0fb75a96572784965cb534;hp=a61ac871bf1804b48d5c89495abd8760b55e1670;hpb=2493ca287cabeb9edc80392ba7ca5374279b80f0;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index a61ac871..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/08/18 14:34:47 $ - Version: $Revision: 1.83 $ + 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; @@ -119,9 +120,10 @@ 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; - -/// \brief TagKey is made to hold the standard Dicom Tag (Group number, Element -/// number) +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. @@ -166,8 +168,12 @@ 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 !... @@ -187,7 +193,7 @@ enum DicomDirType { DD_VISIT }; -/// \brief comparaison operators +/// \brief comparison operators (as used in SerieHelper::AddRestriction() ) enum CompOperators { GDCM_EQUAL = 0, GDCM_DIFFERENT, @@ -196,6 +202,18 @@ enum CompOperators { 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) +}; + /** * \brief structure, for internal use only */