ENH: Adding a deprecation mechanism to gdcm via two MACRO and two config options

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 30d087ed1037403b88d2ceaa3151d66b507e8019..c78b0013aad88a360df4d47cfe2201a04120911c 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/07/19 14:43:48 $
+  Version:   $Revision: 1.82 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -90,12 +90,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
 {
@@ -133,8 +136,10 @@ 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)
 {
@@ -142,15 +147,14 @@ inline bool operator==(TagKey _self, TagKey _val)
 };
 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;
@@ -179,9 +183,19 @@ enum DicomDirType {
    DD_PATIENT,
    DD_STUDY,
    DD_SERIE,
-   DD_IMAGE
+   DD_IMAGE,
+   DD_VISIT
 };
 
+/// \brief comparaison operators 
+enum CompOperators {
+   GDCM_EQUAL = 0,
+   GDCM_DIFFERENT,
+   GDCM_GREATER,
+   GDCM_GREATEROREQUAL,
+   GDCM_LESS,
+   GDCM_LESSOREQUAL
+};
 /**
  * \brief structure, for internal use only
  */