Removal of useless and dangerous methods :

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 17c85d4fefce9290b5d3535a24d89e89f9ccc227..8a716da72856592bee508010148f884297ae8e92 100644 (file)
--- 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/27 22:31:12 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/01/06 20:03:28 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,6 +26,7 @@
 
 namespace gdcm 
 {
+void FillDefaultVRDict(VRHT &vr);
 //-----------------------------------------------------------------------------
 /**
  * \brief Constructor
@@ -34,30 +35,36 @@ VR::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];
-   VRKey key;
-   VRAtr name;
-
-   while (!from.eof()) 
+   if(!from)
    {
-      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 != "")
+      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();
 }
 
 //-----------------------------------------------------------------------------
@@ -92,7 +99,7 @@ void VR::Print(std::ostream &os)
  * \brief   Get the count for an element
  * @param   key key to count
  */
-int VR::Count(VRKey const & key) 
+int VR::Count(VRKey const &key) 
 {
    return vr.count(key);
 }
@@ -101,58 +108,66 @@ int VR::Count(VRKey const & 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)
+bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
    //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
    //   << tested << std::endl;
 
-   if ( tested == "unkn")
+   if ( tested == GDCM_UNKNOWN)
       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.
  */
-bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
+bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
+   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 == "UN" ||
+          tested == "US";
+}
 
-   if ( ! Count(tested) )
-   {
-      dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
-      return false;
-   }
+/**
+ * \brief   Simple predicate that checks wether 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)
+{
+   return tested == "SQ";
+}
 
-   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;
+bool VR::IsValidVR(VRKey const &key)
+{
+   return(vr.find(key)!=vr.end());
 }
 
 //-----------------------------------------------------------------------------