X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=0c81971352057051ce68e5285b9c90765f0fcfad;hb=273cd97da5b40b59ad6bdde05a9e159af1d4165a;hp=6b0330cdbf955cc55eab3755d73d6184ff493d68;hpb=c4fa2e74a4ce56a0a8db54e4a70d404bec9fc8dd;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 6b0330cd..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/08/30 14:40:32 $
-  Version:   $Revision: 1.87 $
+  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
@@ -54,9 +54,10 @@
    // Old system only have this
    #include <inttypes.h>   // For uint8_t uint16_t and uint32_t
 #else
-// Broken plateform 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__)
+// 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;
@@ -119,9 +120,10 @@ 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)
+/// \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.
@@ -166,8 +168,12 @@ 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. Except when it's ImplicitVR !...
@@ -187,7 +193,7 @@ enum DicomDirType {
    DD_VISIT
 };
 
-/// \brief comparison operators 
+/// \brief comparison operators (as used in SerieHelper::AddRestriction() )
 enum CompOperators {
    GDCM_EQUAL = 0,
    GDCM_DIFFERENT,
@@ -197,20 +203,15 @@ enum CompOperators {
    GDCM_LESSOREQUAL
 };
 
-// Loading mode
-#define GDCM_LD_ALL         0x00000000
-#define GDCM_LD_NOSEQ       0x00000001
-#define GDCM_LD_NOSHADOW    0x00000002
-#define GDCM_LD_NOSHADOWSEQ 0x00000004
-
+/// \brief Loading mode
 enum LodModeType
 {
-   LD_ALL         = GDCM_LD_ALL, // Load all
-   LD_NOSEQ       = GDCM_LD_NOSEQ, // Don't load odd groups
-   LD_NOSHADOW    = GDCM_LD_NOSHADOW, // Don't load Sequences
-   LD_NOSHADOWSEQ = GDCM_LD_NOSHADOWSEQ // Don't load Sequences if they belong 
-                                                   // to an odd group
-                                                   // (*exclusive* from LD_NOSEQ and LD_NOSHADOW)
+   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)
 };
 
 /**