X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=786c053a3035279f6a55300560c0dc3714a4ae52;hb=d8398f68ddfe8ec8812e7e02c854fb661997e36e;hp=b45fbbb667d92a5066785bf53ad748a3d5360a50;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index b45fbbb6..786c053a 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:48 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2007/09/18 15:53:25 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,45 +23,56 @@
 
 #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);
 
 //-----------------------------------------------------------------------------
+// Constructor / Destructor
 /**
  * \brief Constructor
  */
 VR::VR() 
 {
-   std::string filename=DictSet::BuildDictPath() + std::string(DICT_VR);
+   std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "VR::VR: can't open dictionary",filename.c_str());
-
-   char buff[1024];
-   std::string key;
-   std::string name;
-
-   while (!from.eof()) 
+   if ( !from )
    {
-      from >> std::ws; // used to be eatwhite(from);
-      from.getline(buff, 1024, ' ');
-      key = buff;
-      from >> std::ws; // used to be eatwhite(from);
-      from.getline(buff, 1024, ';');
-      name = buff;
-
-      from >> std::ws; // used to be eatwhite(from);
-      from.getline(buff, 1024, '\n');
-
-      if(key!="")
+      gdcmWarningMacro("Can't open dictionary " << filename.c_str());
+      FillDefaultVRDict(vr);
+   }
+   else
+   {
+      char buff[1024];
+      VRKey key;
+      VRAtr name;
+   
+      while (!from.eof()) 
       {
-         vr[key]=name;
+         from >> std::ws;
+         from.getline(buff, 1024, ' ');
+         if( strcmp(buff,"") == 0)
+            continue;
+
+         key = buff;
+         from >> std::ws;
+         from.getline(buff, 1024, ';');
+         name = buff;
+   
+         from >> std::ws;
+         from.getline(buff, 1024, '\n');
+   
+         vr[key] = name;
       }
+      from.close();
    }
-   from.close();
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief Destructor
  */
@@ -70,91 +81,126 @@ VR::~VR()
    vr.clear();
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Print all 
- * @param   os The output stream to be written to.
- */
-void VR::Print(std::ostream &os) 
-{
-   std::ostringstream s;
-
-   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
-   {
-      s << "VR : "<<it->first<<" = "<<it->second<<std::endl;
-   }
-   os << s.str();
-}
-
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   Get the count for an element
- * @param   key key to count
- */
-int VR::Count(VRKey key) 
-{
-   return vr.count(key);
-}
 
-//-----------------------------------------------------------------------------
 /**
- * \brief   Simple predicate that checks wether the given argument
- *          corresponds to the Value Representation of a \ref BinEntry .
- *          This predicate is the negation of
- *          \ref VR::IsVROfGdcmStringRepresentable .
+ * \brief   Simple predicate that checks whether the given argument
+ *          corresponds to the Value Representation of a DataEntry .
  * @param   tested value representation to check for.
  */
-bool VR::IsVROfGdcmBinaryRepresentable(VRKey tested)
+bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
-   //   << tested << std::endl;
-
-   if ( tested == "unkn")
-      return true;
-
-   if ( ! Count(tested) )
-   {
-      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+   if ( IsVROfStringRepresentable(tested) )
       return false;
-   }
 
-   if ( IsVROfGdcmStringRepresentable(tested) )
-   {
-      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !");
+   if ( IsVROfSequence(tested) )
       return false;
-   }
 
    return true;
 }
 
-//-----------------------------------------------------------------------------
 /**
- * \brief   Simple predicate that checks wether the given argument
- *          corresponds to the Value Representation of a \ref ValEntry
- *          but NOT a \ref BinEntry.
- * @param   tested value representation to check for.
+ * \brief   Simple predicate that checks whether the given argument
+ *          corresponds to the Value Representation of a
+ *          'std::string representable' value.
+ * @param   tested value representation to be checked.
  */
-bool VR::IsVROfGdcmStringRepresentable(VRKey tested)
+bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
+   return tested == "AE" ||
+          tested == "AS" ||
+          tested == "CS" ||
+          tested == "DA" ||
+          tested == "DS" ||
+          tested == "FL" ||
+          tested == "FD" ||
+          tested == "IS" || 
+          tested == "LO" ||
+          tested == "LT" ||
+          tested == "PN" ||
+          tested == "SH" ||
+          tested == "SL" ||
+          tested == "SS" ||
+          tested == "ST" ||
+          tested == "TM" ||
+          tested == "UI" ||
+          tested == "UL" ||
+          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 returns the length of a elementary elem whose VR is passed
+unsigned short VR::GetAtomicElementLength(VRKey const &tested)
+{
+   // 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;
+}
 
-   if ( ! Count(tested) )
-   {
-      dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
-      return false;
-   }
+// 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
+  // to avoid to search in a std::map of std::string,
+  // since each std::string is 2 characters longs, we check the array
+  // (29 char comparisons in the worst case!)
+  
+  // "RT" is an undocumented VR, found in some Siemens images.
+  // We added it here to be able to read these images.
+  // Dict/gdcmVR.dic, Document has to be updated, too.
+  static const char VRvalues[] =
+    "AEASATCSDADSDTFLFDISLOLTOBOWOFPNSHSLSQSSSTTMUIULUNUSUTRT";
+
+  //int nbVal = strlen(VRvalues)/2; // save CPU time.
+  int nbVal = 28;
+ 
+  const char *pt = VRvalues;
+  for (int i=0;i<nbVal;i++)
+  {
+     if(key[0] == *pt++) {
+       if(key[1] == *pt++) {
+          return true;
+       }
+     }  
+     else {
+        pt++;
+     }        
+  }
+  return false;
+#endif
 
-   if (tested == "AE" || tested == "AS" || tested == "DA" || tested == "PN" ||
-       tested == "UI" || tested == "TM" || tested == "SH" || tested == "LO" ||
-       tested == "CS" || tested == "IS" || tested == "LO" || tested == "LT" ||
-       tested == "SH" || tested == "ST" || tested == "DS" || tested == "SL" ||
-       tested == "SS" || tested == "UL" || tested == "US" || tested == "UN")
-   {
-      return true;
-   }
-   return false;
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // Protected
@@ -163,5 +209,18 @@ bool VR::IsVROfGdcmStringRepresentable(VRKey tested)
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Print all 
+ * @param   os The output stream to be written to.
+ */
+void VR::Print(std::ostream &os,std::string const &) 
+{
+   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+   {
+      os << "VR : " << it->first << " = " << it->second << std::endl;
+   }
+}
 
+//-----------------------------------------------------------------------------
 } // end namespace gdcm