X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=9e032195edf3e710df590b6657e40b5c61156ae7;hb=befb2f26b6053ac140ffa008e41d7bb8d7eeafc8;hp=22e54fc60198393f2d36066295eeaaba54dbc72f;hpb=e8439d97c8441809e9a5236e729bae1a25ffb418;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 22e54fc6..9e032195 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/11/16 14:48:19 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/01/06 17:16:16 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -112,67 +112,64 @@ int VR::Count(VRKey const & key)
  *          \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 == "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());
 }
 
 //-----------------------------------------------------------------------------