X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=c0db974c4436c34c3f748414735c6e6df9df8609;hb=9f274230cc36f77f784729031fbe3e7d576f13ea;hp=384aa738d9fc0ee116155f3679912758558dda10;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 384aa738..c0db974c 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2004/07/02 13:55:27 $ - Version: $Revision: 1.28 $ + Date: $Date: 2004/09/27 08:39:05 $ + Version: $Revision: 1.33 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -47,8 +47,9 @@ //----------------------------------------------------------------------------- #ifdef __GNUC__ #ifndef HAVE_NO_STDINT_H -#include // For uint16_t and uint32_t +#include // For uint8_t uint16_t and uint32_t #else +typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; #define UINT32_MAX (4294967295U) @@ -56,6 +57,7 @@ typedef unsigned int uint32_t; #endif #ifdef _MSC_VER +typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; #define UINT32_MAX (4294967295U) @@ -89,8 +91,38 @@ typedef unsigned int uint32_t; #include -const std::string GDCM_UNFOUND = "gdcm::Unfound"; /// MEMORY LEAK +const std::string GDCM_UNFOUND = "gdcm::Unfound"; /// MEMORY LEAK +const std::string GDCM_BINLOADED = "gdcm::Binary data loaded"; +const std::string GDCM_NOTLOADED = "gdcm::NotLoaded"; +const std::string GDCM_UNREAD = "gdcm::UnRead"; +/// \brief gdcmTagKey is made to old an "universal" (as in URL, Universal +/// Ressource Locator) key to a gdcmDocEntry i.e. a dicom tag. +/// A dicom tag allways has a group and an element, but a set of tags +/// embeded in various (optionally nested) sequences and sharing +/// the same group and element all share the same (group, element) +/// "identifier". Hence the (group, element) 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 element 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 gdcmTagKey is given by: +/// Group|Element[SeqTag] +/// where [SeqTag] means NO or many instances of SeqTag. +/// Hence the gdcmTagKey of a tag not "leaving" in a sequence is the +/// string e.g. +/// 0028|1201 +/// but the gdcmTagKey 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 typedef std::string gdcmTagKey; typedef std::string TagName;