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

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index f002d0a0..d68b9155 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,88 +1,202 @@
-// gdcmVR.cxx
-#include <fstream>
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.cxx,v $
+  Language:  C++
+  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
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
+#include "gdcmDictSet.h"
+#include "gdcmDebug.h"
 
-#ifndef PUB_DICT_PATH
-#  define PUB_DICT_PATH     "../Dicts/"
-#endif
-#define DICT_VR "dicomVR.dic"
-
+#include <fstream>
 #include <iostream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
+#include <string.h>
+
+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
-gdcmVR::gdcmVR(void) 
+/**
+ * \brief Constructor
+ */
+VR::VR() 
 {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
+   std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "gdcmVR::gdcmVR: can't open dictionary",filename.c_str());
-
-   char buff[1024];
-   std::string key;
-   std::string name;
-
-   while (!from.eof()) 
+   if ( !from )
    {
-      eatwhite(from);
-      from.getline(buff, 1024, ' ');
-      key = buff;
-      eatwhite(from);
-      from.getline(buff, 1024, ';');
-      name = buff;
-
-      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();
 }
 
-gdcmVR::~gdcmVR() {
+/**
+ * \brief Destructor
+ */
+VR::~VR()
+{
    vr.clear();
 }
 
 //-----------------------------------------------------------------------------
-// Print
+// Public
+
 /**
- * \ingroup gdcmVR
- * \brief   Print all 
- * @param   os The output stream to be written to.
+ * \brief   Simple predicate that checks whether the given argument
+ *          corresponds to the Value Representation of a \ref DataEntry .
+ * @param   tested value representation to check for.
  */
-void gdcmVR::Print(std::ostream &os) 
+bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   std::ostringstream s;
+   if ( IsVROfStringRepresentable(tested) )
+      return false;
 
-   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
-   {
-      s << "VR : "<<it->first<<" = "<<it->second<<std::endl;
-   }
-   os << s.str();
+   if ( IsVROfSequence(tested) )
+      return false;
+
+   return true;
 }
 
-//-----------------------------------------------------------------------------
-// Public
 /**
- * \ingroup gdcmVR
- * \brief   Get the count for an element
- * @param   Key key to count
+ * \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.
  */
-int gdcmVR::Count(VRKey key) 
+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)
 {
-   return vr.count(key);
+   // 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;
 }
 
+// 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
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -90,3 +204,18 @@ int gdcmVR::Count(VRKey key)
 // 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