X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=26ded6d39b3c440f619d9c68ca50a5cd4748bcf2;hb=3a9e9df62b3198c4f93d1768074b6be828ac7308;hp=bbccb6b002dd482030a2ffcf8b867812899fd139;hpb=e0e3ff9986778666bc665801af48923d30eb8ee7;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index bbccb6b0..26ded6d3 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/10 19:23:31 $ - Version: $Revision: 1.48 $ + Date: $Date: 2005/04/05 10:56:25 $ + Version: $Revision: 1.63 $ 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 ) @@ -45,26 +47,39 @@ #endif //_MSC_VER //----------------------------------------------------------------------------- -#ifdef GDCM_HAVE_STDINT_H -#include // For uint8_t uint16_t and uint32_t +#ifdef CMAKE_HAVE_STDINT_H + #include #else -#if defined(_MSC_VER) || defined(__BORLANDC__) -typedef signed char int8_t; +#ifdef CMAKE_HAVE_INTTYPES_H + // Old system only have this + #include // For uint8_t uint16_t and uint32_t #endif -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#define UINT32_MAX (4294967295U) #endif +// Broken plateform do not respect C99 and do not provide those typedef #if defined(_MSC_VER) || defined(__BORLANDC__) -#define GDCM_EXPORT __declspec( dllexport ) +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; +#define UINT32_MAX (4294967295U) +#endif + +#if defined(_WIN32) && defined(BUILD_SHARED_LIBS) + #ifdef gdcm_EXPORTS + #define GDCM_EXPORT __declspec( dllexport ) + #else + #define GDCM_EXPORT __declspec( dllimport ) + #endif #else -#define GDCM_EXPORT + #define GDCM_EXPORT #endif #include +/// \brief namespace for Grass root DiCoM namespace gdcm { @@ -77,40 +92,25 @@ namespace gdcm #define DICT_ELEM "DicomDir.dic" #define DICT_TS "dicomTS.dic" #define DICT_VR "dicomVR.dic" +#define DICT_GROUP_NAME "DictGroupName.dic" -struct Dummy {}; -template -struct Strings_ -{ - static std::string const UNKNOWN; - static std::string const UNFOUND; - static std::string const BINLOADED; - static std::string const NOTLOADED; - static std::string const UNREAD; -}; -template std::string const Strings_::UNKNOWN = "gdcm::Unknown"; -template std::string const Strings_::UNFOUND = "gdcm::Unfound"; -template std::string const Strings_::BINLOADED = "gdcm::Binary data loaded"; -template std::string const Strings_::NOTLOADED = "gdcm::NotLoaded"; -template std::string const Strings_::UNREAD = "gdcm::UnRead"; -typedef Strings_ Strings; -#define GDCM_UNKNOWN Strings::UNKNOWN -#define GDCM_UNFOUND Strings::UNFOUND -#define GDCM_BINLOADED Strings::BINLOADED -#define GDCM_NOTLOADED Strings::NOTLOADED -#define GDCM_UNREAD Strings::UNREAD +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; /// \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 element, but a set of tags +/// 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 element all share the same (group, element) -/// "identifier". Hence the (group, element) cannot be used as an +/// 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 element dicom tag members, +/// 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 @@ -132,11 +132,35 @@ typedef std::string TagName; 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 +}; + +/** + * \brief structure, for internal use only + */ +GDCM_EXPORT typedef struct +{ + /// DicomGroup number + unsigned short int Group; + /// DicomElement number + unsigned short int Elem; + /// value (coded as a std::string) of the Element + std::string Value; +} Element; + } //namespace gdcm //----------------------------------------------------------------------------- #endif