X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=c66ad0d5a8ca90bd065ea0f8129ce8e314dfe1a6;hb=cd6b936f711fcbc70918e6b623b4b7b2f65dc69c;hp=f4889a5d29fb07171b2fc87ca237688d312b3494;hpb=88f0d04d3b4e7e1f2a87185f6e1818364519d1bf;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index f4889a5d..c66ad0d5 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/11 19:46:05 $ - Version: $Revision: 1.78 $ + Date: $Date: 2005/08/22 15:38:05 $ + Version: $Revision: 1.85 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -97,6 +97,8 @@ typedef unsigned int uint32_t; #include #endif + +//----------------------------------------------------------------------------- /// \brief namespace for Grass root DiCoM namespace gdcm { @@ -138,11 +140,11 @@ inline std::ostream& operator<<(std::ostream& _O, TagKey _val) 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 @@ -153,7 +155,7 @@ inline bool operator<(TagKey _self, TagKey _val) 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 @@ -162,7 +164,7 @@ typedef std::string TagKey; inline std::ostream& operator<<(std::ostream& _O, std::string _val) { return _O << _val.c_str(); -}; +} #endif typedef std::string TagName; @@ -181,9 +183,19 @@ enum DicomDirType { DD_PATIENT, DD_STUDY, DD_SERIE, - DD_IMAGE + DD_IMAGE, + DD_VISIT }; +/// \brief comparaison operators +enum CompOperators { + GDCM_EQUAL = 0, + GDCM_DIFFERENT, + GDCM_GREATER, + GDCM_GREATEROREQUAL, + GDCM_LESS, + GDCM_LESSOREQUAL +}; /** * \brief structure, for internal use only */