X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=0c81971352057051ce68e5285b9c90765f0fcfad;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=82b8dae28b1b702449f0d4c337e9aba1dcae6098;hpb=6df14b12a643a8cc3061192b22e549eed18cca73;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 82b8dae2..0c819713 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/01/22 12:39:12 $ - Version: $Revision: 1.55 $ + Date: $Date: 2005/09/07 08:23:08 $ + Version: $Revision: 1.92 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,6 +27,8 @@ // 'identifier' : class 'type' needs to have dll-interface to be used by // clients of class 'type2' #pragma warning ( disable : 4251 ) +// non dll-interface class 'type' used as base for dll-interface class 'type2' +#pragma warning ( disable : 4275 ) // 'identifier' : identifier was truncated to 'number' characters in the // debug information #pragma warning ( disable : 4786 ) @@ -46,15 +48,30 @@ //----------------------------------------------------------------------------- #ifdef CMAKE_HAVE_STDINT_H -#include // For uint8_t uint16_t and uint32_t + #include #else -#if defined(_MSC_VER) || defined(__BORLANDC__) -typedef signed char int8_t; -#endif -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#define uint64_t unsigned __int64 // problems with swig when using a typedef +#ifdef CMAKE_HAVE_INTTYPES_H + // Old system only have this + #include // For uint8_t uint16_t and uint32_t +#else +// 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; +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#else +#error "Sorry your plateform is not supported" +#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) +#endif // CMAKE_HAVE_INTTYPES_H +#endif // CMAKE_HAVE_STDINT_H + +// Basically for VS6 and bcc 5.5.1: +#ifndef UINT32_MAX #define UINT32_MAX (4294967295U) #endif @@ -69,7 +86,21 @@ 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 { @@ -78,63 +109,124 @@ namespace gdcm # define PUB_DICT_PATH "../Dicts/" #endif #define PUB_DICT_NAME "DicomV3Dict" -#define PUB_DICT_FILENAME "dicomV3.dic" +#define PUB_DICT_FILENAME "gdcm.dic" #define DICT_ELEM "DicomDir.dic" #define DICT_TS "dicomTS.dic" #define DICT_VR "dicomVR.dic" +#define DICT_GROUP_NAME "DictGroupName.dic" GDCM_EXPORT extern const std::string GDCM_UNKNOWN; 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; + +/// \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. + +#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; -/// \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 + // 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 + ExplicitVR, // DicomDir is in this case. Except when it's ImplicitVR !... ImplicitVR, ACR, ACR_LIBIDO }; +/// \brief type of the elements composing a DICOMDIR (for internal use only) enum DicomDirType { DD_UNKNOWN = 0, DD_META, 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) +}; + +/** + * \brief structure, for internal use only + */ +struct Element +{ + /// DicomGroup number + unsigned short int Group; + /// DicomElement number + unsigned short int Elem; + /// value (coded as a std::string) of the Element + std::string Value; +}; + } //namespace gdcm //----------------------------------------------------------------------------- #endif