X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=19596be9470c2e6d39ec0f035cb533df61281a6d;hb=1771b10b3f1a4d6f96ea1869fb005f0d48b62eda;hp=bd179cf8538ea9334018a94dcf5e243bbe646c48;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index bd179cf8..19596be9 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/02/01 10:29:56 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2007/06/22 10:02:48 $
+  Version:   $Revision: 1.56 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,10 +23,13 @@
 
 #include <fstream>
 #include <iostream>
+#include <string.h>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
+/// \brief auto generated function, to fill up the 'Value Representation'
+///        Dictionnary, if relevant file is not found on user's disk
 void FillDefaultVRDict(VRHT &vr);
 
 //-----------------------------------------------------------------------------
@@ -38,9 +41,9 @@ VR::VR()
 {
    std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   if(!from)
+   if ( !from )
    {
-      gdcmVerboseMacro("Can't open dictionary" << filename.c_str());
+      gdcmWarningMacro("Can't open dictionary " << filename.c_str());
       FillDefaultVRDict(vr);
    }
    else
@@ -53,6 +56,9 @@ VR::VR()
       {
          from >> std::ws;
          from.getline(buff, 1024, ' ');
+         if( strcmp(buff,"") == 0)
+            continue;
+
          key = buff;
          from >> std::ws;
          from.getline(buff, 1024, ';');
@@ -61,10 +67,7 @@ VR::VR()
          from >> std::ws;
          from.getline(buff, 1024, '\n');
    
-         if(key != "")
-         {
-            vr[key] = name;
-         }
+         vr[key] = name;
       }
       from.close();
    }
@@ -80,25 +83,14 @@ VR::~VR()
 
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   Get the count for an element
- * @param   key key to count
- */
-int VR::Count(VRKey const &key) 
-{
-   return vr.count(key);
-}
 
 /**
  * \brief   Simple predicate that checks whether the given argument
- *          corresponds to the Value Representation of a \ref BinEntry .
+ *          corresponds to the Value Representation of a \ref DataEntry .
  * @param   tested value representation to check for.
  */
 bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   if ( tested == GDCM_UNKNOWN)
-      return true;
-
    if ( IsVROfStringRepresentable(tested) )
       return false;
 
@@ -110,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 \ref ValEntry
- *          but NOT a \ref BinEntry.
+ *          corresponds to the Value Representation of a
+ *          'std::string representable' value.
  * @param   tested value representation to be checked.
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
@@ -121,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" ||
@@ -132,24 +126,69 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "TM" ||
           tested == "UI" ||
           tested == "UL" ||
-          tested == "UN" ||
-          tested == "US";
+          tested == "US" ||
+          tested == "UT";
+
+   // Should be quicker
+   // --> will *never* work : any rotten value would be considered as OK !
+/*
+   return tested != "OB" &&
+          tested != "OW" &&
+          tested != "OF" &&
+          tested != "AT" && // Attribute Tag ?!? contain no printable character
+          tested != "UN" && // UN is an actual VR !
+          tested != "SQ" ;
+*/
 }
-
-/**
- * \brief   Simple predicate that checks whether the given argument
- *          corresponds to the Value Representation of a \ref SeqEntry
- * @param   tested value representation to check for.
- */
-bool VR::IsVROfSequence(VRKey const &tested)
+/// \brief returns the length of a elementary elem whose VR is passed
+unsigned short VR::GetAtomicElementLength(VRKey const &tested)
 {
-   return tested == "SQ";
+   // Unsigned & signed short
+   if( tested == "US" || tested == "SS" )
+      return 2;
+   // Unsigned & signed long
+   if( tested == "UL" || tested == "SL" )
+      return 4;
+   // Float
+   if( tested == "FL" )
+      return 4;
+   // Double
+   if( tested == "FD" )
+      return 8;
+   // Word string
+   if( tested == "OW" )
+      return 2;
+   // Float string
+   if( tested == "OF" )
+      return 4;   
+   return 1;
 }
 
-bool VR::IsValidVR(VRKey const &key)
+// 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 &tested)
 {
-   return vr.find(key) != vr.end();
+//  return vr.find(key) != vr.end();
+  static const char VRvalues[] =
+    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
+
+  int nbVal = 26;
+  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
 
 //-----------------------------------------------------------------------------
 // Protected
@@ -163,15 +202,12 @@ 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 &) 
 {
-   std::ostringstream s;
-
    for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
    {
-      s << "VR : " << it->first << " = " << it->second << std::endl;
+      os << "VR : " << it->first << " = " << it->second << std::endl;
    }
-   os << s.str();
 }
 
 //-----------------------------------------------------------------------------