Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2006/03/01 09:53:24 $
- Version: $Revision: 1.105 $
+ Date: $Date: 2007/08/22 16:14:03 $
+ Version: $Revision: 1.116 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
-#ifndef GDCMCOMMON_H
-#define GDCMCOMMON_H
+#ifndef _GDCMCOMMON_H_
+#define _GDCMCOMMON_H_
#include "gdcmConfigure.h"
#include "gdcmSystem.h"
#include "gdcmMacro.h"
-
+#include "gdcmVRKey.h"
#include <string>
//-----------------------------------------------------------------------------
#define GDCM_EXPORT
#endif
+#ifdef __BORLANDC__
+#include <mem.h>
+#endif
+
//-----------------------------------------------------------------------------
/// \brief namespace for Grass root DiCoM
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
// Centralize information about the gdcm dictionary in only one file:
+//
+// ==>
+// ==> Don't forget gdcm/gdcmPython/gdcm.i
+// ==>
+//
+
#ifndef PUB_DICT_PATH
# define PUB_DICT_PATH "../Dicts/"
#endif
-#define PUB_DICT_NAME "DicomV3Dict"
+#define PUB_DICT_NAME "dicomV3Dict"
+
+// dicomV3.dic replaced by the generated gdcm.dic/
+// if gdcm.dic not found, method FillDefaultDataDict() is invoked
+//#define PUB_DICT_FILENAME "dicomV3.dic"
#define PUB_DICT_FILENAME "gdcm.dic"
#define DICT_ELEM "DicomDir.dic"
#define DICT_TS "dicomTS.dic"
GDCM_EXPORT extern const std::string GDCM_NOTASCII;
GDCM_EXPORT extern const std::string GDCM_PIXELDATA;
-GDCM_EXPORT extern const std::string GDCM_VRUNKNOWN;
+GDCM_EXPORT extern const char GDCM_VRUNKNOWN[2];
GDCM_EXPORT extern const char GDCM_FILESEPARATOR;
/// \brief various types of a DICOM file (for internal use only)
enum FileType {
+// note to developer : don't forget to add as well in vtkGdcmWriter.h !
Unknown = 0,
ExplicitVR, // DicomDir is in this case. Except when it's ImplicitVR !...
ImplicitVR,
ACR,
ACR_LIBIDO,
- JPEG
+ /// \todo FIXME : an encapsulated JPEG file may be
+ /// either ExplicitVR or ImplicitVR, right?
+ JPEG,
+ JPEG2000
};
/// \brief type of the elements composing a DICOMDIR (for internal use only)
/// FILTERED_IMAGE
/// -3) user created a new image, using existing images (eg MIP, MPR, cartography image)
/// CREATED_IMAGE
-/// -4) user anonymized an image without processing the pixels.
-/// ANONYMIZED_IMAGE
+/// -4) user modified/added some tags *without processing* the pixels (anonymization...
+/// UNMODIFIED_PIXELS_IMAGE
enum ImageContentType
{
- USER_OWN_IMAGE,
+// note to developer : don't forget to add as well in vtkGdcmWriter.h !
+ USER_OWN_IMAGE = 1,
FILTERED_IMAGE,
CREATED_IMAGE,
UNMODIFIED_PIXELS_IMAGE
unsigned short int Group;
/// Dicom Element number
unsigned short int Elem;
+ /// Value Representation
+ VRKey VR;
/// value (coded as a std::string) of the Element
std::string Value;
};