* Minor coding-style clean up

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index c2a238506cc6a5ab3c3abc37fbd3a170a8cb53db..fb43af6536774fc63c223dcb76a1e5fc102d9798 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/18 10:20:20 $
-  Version:   $Revision: 1.81 $
+  Date:      $Date: 2005/10/11 08:24:10 $
+  Version:   $Revision: 1.93 $
                                                                                 
   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;
@@ -97,6 +98,8 @@ typedef  unsigned int        uint32_t;
 #include <iostream>
 #endif
 
+
+//-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
 namespace gdcm
 {
@@ -117,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;
-
-/// \brief TagKey is made to hold the standard Dicom Tag (Group number, Element
-/// number)
+GDCM_EXPORT extern const std::string GDCM_NOTASCII;
+GDCM_EXPORT extern const std::string GDCM_PIXELDATA;
+/// \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.
@@ -138,11 +142,11 @@ inline std::ostream& operator<<(std::ostream& _O, TagKey _val)
   return (_O << std::hex << std::setw( 4 ) << std::setfill( '0' )
      << _val.tab[0] << '|' << std::setw( 4 ) << std::setfill( '0' )
      << _val.tab[1] << std::setfill( ' ' ) << std::dec);
-};
+}
 inline bool operator==(TagKey _self, TagKey _val)
 {
   return _self.tagkey == _val.tagkey;
-};
+}
 inline bool operator<(TagKey _self, TagKey _val)
 {
   // This expression is a tad faster but PrintFile output
@@ -153,7 +157,7 @@ inline bool operator<(TagKey _self, TagKey _val)
   if( _self.tab[0] == _val.tab[0] )
     return _self.tab[1] < _val.tab[1];
   return _self.tab[0] < _val.tab[0];
-};
+}
 #else
 typedef std::string TagKey;
 #endif
@@ -162,10 +166,14 @@ typedef std::string TagKey;
 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 !...
@@ -185,7 +193,7 @@ enum DicomDirType {
    DD_VISIT
 };
 
-/// \brief comparaison operators 
+/// \brief comparison operators (as used in SerieHelper::AddRestriction() )
 enum CompOperators {
    GDCM_EQUAL = 0,
    GDCM_DIFFERENT,
@@ -194,6 +202,18 @@ enum CompOperators {
    GDCM_LESS,
    GDCM_LESSOREQUAL
 };
+
+/// \brief Loading mode
+enum LodModeType
+{
+   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)
+};
+
 /**
  * \brief structure, for internal use only
  */