X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=c66ad0d5a8ca90bd065ea0f8129ce8e314dfe1a6;hb=cd6b936f711fcbc70918e6b623b4b7b2f65dc69c;hp=f5b5647c2c1d5a3d17d23549d7d7ceb765b6f09c;hpb=d20e173577c7a226309c6dd42186d8775551292e;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index f5b5647c..c66ad0d5 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/07/11 15:05:22 $
-  Version:   $Revision: 1.71 $
+  Date:      $Date: 2005/08/22 15:38:05 $
+  Version:   $Revision: 1.85 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -85,7 +85,20 @@ typedef  unsigned int        uint32_t;
 #endif
 
 #include <string>
+#define FASTTAGKEY 0
 
+// 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
 {
@@ -115,14 +128,43 @@ GDCM_EXPORT extern const std::string GDCM_UNREAD;
 /// We'll fix the mess up -without any change in the API- as soon as the bench
 /// marks are fully performed.
 
+#if FASTTAGKEY
+typedef union   {
+      uint16_t  tab[2];
+      uint32_t  tagkey;
+    } TagKey;
+/* ostream operator for TagKey */
+inline std::ostream& operator<<(std::ostream& _O, TagKey _val)
+{
+  _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)
+{
+  // 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
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
-#include <iostream>
-/* ostream operator for std::string since VS6 does not provide it*/
+// Doing everything within gdcm namespace to avoid polluting 3d party software
 inline std::ostream& operator<<(std::ostream& _O, std::string _val)
 {
   return _O << _val.c_str();
-};
+}
 #endif
 typedef std::string TagName;
 
@@ -141,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
  */