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

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index f002d0a0..57b93016 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,86 +1,149 @@
-// gdcmVR.cxx
-#include <fstream>
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/09/07 14:12:23 $
+  Version:   $Revision: 1.40 $
+                                                                                
+  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
+
+namespace gdcm 
+{
+//-----------------------------------------------------------------------------
+/// \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, ' ');
+         key = buff;
+         from >> std::ws;
+         from.getline(buff, 1024, ';');
+         name = buff;
+   
+         from >> std::ws;
+         from.getline(buff, 1024, '\n');
+   
+         if ( key != "" )
+         {
+            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 BinEntry .
+ * @param   tested value representation to check for.
  */
-void gdcmVR::Print(std::ostream &os) 
+bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   std::ostringstream s;
+   //if ( tested == GDCM_UNKNOWN)
+   //{
+   //std::cout << "---------- never used --------------" << tested 
+   //          << std::endl;
+   //   return true;
+   //}
 
-   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
-   {
-      s << "VR : "<<it->first<<" = "<<it->second<<std::endl;
-   }
-   os << s.str();
+   if ( IsVROfStringRepresentable(tested) )
+      return false;
+
+   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 \ref ValEntry
+ *          but NOT a \ref BinEntry.
+ * @param   tested value representation to be checked.
  */
-int gdcmVR::Count(VRKey key) 
+bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
-   return vr.count(key);
+
+
+   return tested == "AE" ||
+          tested == "AS" ||
+          tested == "CS" ||
+          tested == "DA" ||
+          tested == "DS" ||
+          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 --> But it doesn't work : revert to old code
+/*
+   return tested != "FL" &&
+          tested != "FD" &&
+          tested != "OB" &&
+          tested != "OW" &&
+          tested != "AT" && // Attribute Tag ?!?
+          tested != "SQ" ;
+*/
 }
 
 //-----------------------------------------------------------------------------
@@ -90,3 +153,21 @@ 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::ostringstream s;
+
+   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+   {
+      s << "VR : " << it->first << " = " << it->second << std::endl;
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm