STYLE: Cleanup

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 30d087ed1037403b88d2ceaa3151d66b507e8019..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/11 15:20:46 $
-  Version:   $Revision: 1.73 $
+  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;
@@ -90,12 +91,15 @@ typedef  unsigned int        uint32_t;
 // FIXME: Should rewrite this:
 #if FASTTAGKEY
 #include <iostream>
+#include <iomanip>
 #endif
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
 /* ostream operator for std::string since VS6 does not provide it*/
 #include <iostream>
 #endif
 
+
+//-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
 namespace gdcm
 {
@@ -116,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.
@@ -133,25 +138,26 @@ typedef union   {
 /* ostream operator for TagKey */
 inline std::ostream& operator<<(std::ostream& _O, TagKey _val)
 {
-  return ( _O << std::ios::hex << _val.tab[0] 
-    << "|" << std::ios::hex << _val.tab[1] );
-};
+  _O.setf( std::ios::right);
+  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)
 {
-  return _self.tagkey < _val.tagkey;
-};
-// FIXME
-// This one is clearly weird, see gdcmDocument:918
-inline TagKey operator+(TagKey _self, TagKey _val)
-{
-  TagKey r;
-  r.tagkey = _self.tagkey + _val.tagkey;
-  return r;
-};
+  // This expression is a tad faster but PrintFile output
+  // is more difficult to read
+  //return _self.tagkey < _val.tagkey;
+
+  // More usal order of dicom tags:
+  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
@@ -160,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 !...
@@ -179,7 +189,29 @@ enum DicomDirType {
    DD_PATIENT,
    DD_STUDY,
    DD_SERIE,
-   DD_IMAGE
+   DD_IMAGE,
+   DD_VISIT
+};
+
+/// \brief comparison operators (as used in SerieHelper::AddRestriction() )
+enum CompOperators {
+   GDCM_EQUAL = 0,
+   GDCM_DIFFERENT,
+   GDCM_GREATER,
+   GDCM_GREATEROREQUAL,
+   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)
 };
 
 /**