X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=d68b915536925c7224bd9c41f7502f854e66c9eb;hb=4f0dd702736cecd2fa0b27bedf2118231468f226;hp=29670812080cf006d5e3f206499b53ef6862a1b9;hpb=f541928adfc662b7ae54169e75d2bcf05566b724;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 29670812..d68b9155 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 08:28:03 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2007/09/15 11:13:37 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <string.h>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 /// \brief auto generated function, to fill up the 'Value Representation'
@@ -91,13 +91,6 @@ VR::~VR()
  */
 bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   //if ( tested == GDCM_UNKNOWN)
-   //{
-   //std::cout << "---------- never used --------------" << tested 
-   //          << std::endl;
-   //   return true;
-   //}
-
    if ( IsVROfStringRepresentable(tested) )
       return false;
 
@@ -109,8 +102,8 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 
 /**
  * \brief   Simple predicate that checks whether the given argument
- *          corresponds to the Value Representation of a representable
- *          string.
+ *          corresponds to the Value Representation of a
+ *          'std::string representable' value.
  * @param   tested value representation to be checked.
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
@@ -120,6 +113,8 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "CS" ||
           tested == "DA" ||
           tested == "DS" ||
+          tested == "FL" ||
+          tested == "FD" ||
           tested == "IS" || 
           tested == "LO" ||
           tested == "LT" ||
@@ -134,17 +129,18 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "US" ||
           tested == "UT";
 
-   // Should be quicker --> But it doesn't work : revert to old code
+   // Should be quicker
+   // --> will *never* work : any rotten value would be considered as OK !
 /*
-   return tested != "FL" &&
-          tested != "FD" &&
-          tested != "OB" &&
+   return tested != "OB" &&
           tested != "OW" &&
-          tested != "AT" && // Attribute Tag ?!?
+          tested != "OF" &&
+          tested != "AT" && // Attribute Tag ?!? contain no printable character
+          tested != "UN" && // UN is an actual VR !
           tested != "SQ" ;
 */
 }
-
+/// \brief returns the length of a elementary elem whose VR is passed
 unsigned short VR::GetAtomicElementLength(VRKey const &tested)
 {
    // Unsigned & signed short
@@ -162,14 +158,42 @@ unsigned short VR::GetAtomicElementLength(VRKey const &tested)
    // Word string
    if( tested == "OW" )
       return 2;
+   // Float string
+   if( tested == "OF" )
+      return 4;   
    return 1;
 }
 
 // VS6 need a single implementation in the dll
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
+/// \brief checks is a supposed-to-be VR is a 'legal' one.
 bool VR::IsValidVR(VRKey const &key)
 {
   return vr.find(key) != vr.end();
+#ifdef USECOMPLETELYUNTESTEDCODE
+// "RT" is an undocumented VR, found in some Siemens images.
+// We added it here to be able to read these images.
+// Dict/gdcmVR.dic has to be updated, too.
+  static const char VRvalues[] =
+    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQRT";
+
+  //int nbVal = strlen(VRvalues)/2; // save CPU time.
+  int nbVal = 27;
+  
+  const char *pt = VRvalues;
+  for (int i=0;i<nbVal;i++)
+  {
+     if(tested[0] == *pt++) {
+       if(tested[1] == *pt++)
+          return true;
+     }  
+     else {
+        pt++;
+     }        
+  }
+  return false;
+#endif
+
 }
 #endif
 
@@ -185,7 +209,7 @@ bool VR::IsValidVR(VRKey const &key)
  * \brief   Print all 
  * @param   os The output stream to be written to.
  */
-void VR::Print(std::ostream &os) 
+void VR::Print(std::ostream &os,std::string const &) 
 {
    for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
    {