Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2005/01/22 22:21:19 $
- Version: $Revision: 1.56 $
+ Date: $Date: 2005/07/02 19:19:57 $
+ Version: $Revision: 1.68 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// '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 )
#endif
// Broken plateform do not respect C99 and do not provide those typedef
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef signed __int8 int8_t;
-typedef signed __int16 int16_t;
-typedef signed __int32 int32_t;
-typedef signed __int64 int64_t;
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
+// 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;
#define UINT32_MAX (4294967295U)
#endif
#include <string>
+/// \brief namespace for Grass root DiCoM
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_UNREAD;
/// \brief TagKey is made to hold an "universal" (as in URL, Universal
-/// Ressource Locator) key to a DocEntry i.e. a dicom tag.
+/// 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)
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_SERIE,
DD_IMAGE
};
+
+/**
+ * \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