X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=66006a86f1971b9749ee32dfbca6a8e7b4f31169;hb=251590eb8bbe0635858d05909052d11c6a7ba490;hp=fd4f985813e326920a978a878804bc0b1490153e;hpb=0e82725d64f17545e782c18039ced7ea898f8cad;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index fd4f9858..66006a86 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,74 +1,94 @@
-// gdcmVR.cxx
-//-----------------------------------------------------------------------------
-#include <fstream>
-
-#include <iostream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/06 13:35:38 $
+  Version:   $Revision: 1.25 $
+                                                                                
+  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>
 
+namespace gdcm 
+{
+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!="")
+      dbg.Verbose(2, "VR::VR: 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
 /**
- * \ingroup gdcmVR
  * \brief   Print all 
  * @param   os The output stream to be written to.
  */
-void gdcmVR::Print(std::ostream &os) 
+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;
+      s << "VR : " << it->first << " = " << it->second << std::endl;
    }
    os << s.str();
 }
@@ -76,15 +96,90 @@ void gdcmVR::Print(std::ostream &os)
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \ingroup gdcmVR
  * \brief   Get the count for an element
  * @param   key key to count
  */
-int gdcmVR::Count(VRKey key) 
+int VR::Count(VRKey const & 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 .
+ * @param   tested value representation to check for.
+ */
+bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested)
+{
+   //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
+   //   << tested << std::endl;
+
+   if ( tested == GDCM_UNKNOWN)
+      return true;
+
+   if ( ! IsValidVR(tested) )
+   {
+      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+      return false;
+   }
+
+   if ( IsVROfGdcmStringRepresentable(tested) )
+   {
+      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !");
+      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.
+ */
+bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
+{
+
+   if ( ! IsValidVR(tested) )
+   {
+      dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
+      return false;
+   }
+
+   if ( 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 == "UN" ||
+        tested == "US" )
+   {
+      return true;
+   }
+   return false;
+}
+
+bool VR::IsValidVR(VRKey const & key)
+{
+   return(vr.find(key)!=vr.end());
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -92,3 +187,5 @@ int gdcmVR::Count(VRKey key)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm