X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=77bbf2313bea542f05c03e027f7fcb9587f2307e;hb=bd1e1aea88a95e4d14cd59088a7e5280703402ea;hp=3e461697ba8c319de06d5007c58d3f486dcc807a;hpb=9ca0e4bb2208be93bebf21d0c5d75c8018e7605a;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 3e461697..77bbf231 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/24 10:55:59 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/10/18 08:35:51 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -82,24 +82,20 @@ VR::~VR()
 
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   Get the count for an element
- * @param   key key to count
- */
-int VR::Count(VRKey const &key) 
-{
-   return vr.count(key);
-}
 
 /**
  * \brief   Simple predicate that checks whether the given argument
- *          corresponds to the Value Representation of a \ref BinEntry .
+ *          corresponds to the Value Representation of a \ref DataEntry .
  * @param   tested value representation to check for.
  */
 bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   if ( tested == GDCM_UNKNOWN)
-      return true;
+   //if ( tested == GDCM_UNKNOWN)
+   //{
+   //std::cout << "---------- never used --------------" << tested 
+   //          << std::endl;
+   //   return true;
+   //}
 
    if ( IsVROfStringRepresentable(tested) )
       return false;
@@ -112,8 +108,8 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 
 /**
  * \brief   Simple predicate that checks whether the given argument
- *          corresponds to the Value Representation of a \ref ValEntry
- *          but NOT a \ref BinEntry.
+ *          corresponds to the Value Representation of a representable
+ *          string.
  * @param   tested value representation to be checked.
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
@@ -134,23 +130,38 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "TM" ||
           tested == "UI" ||
           tested == "UL" ||
-          tested == "UN" ||
-          tested == "US";
-}
-
-/**
- * \brief   Simple predicate that checks whether 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";
+          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" ;
+*/
 }
 
-bool VR::IsValidVR(VRKey const &key)
+unsigned short VR::GetAtomicElementLength(VRKey const &vr)
 {
-   return vr.find(key) != vr.end();
+   // Unsigned & signed short
+   if( vr == "US" || vr == "SS" )
+      return 2;
+   // Unsigned & signed long
+   if( vr == "UL" || vr == "SL" )
+      return 4;
+   // Float
+   if( vr == "FL" )
+      return 4;
+   // Double
+   if( vr == "FD" )
+      return 8;
+   // Word string
+   if( vr == "OW" )
+      return 2;
+   return 1;
 }
 
 //-----------------------------------------------------------------------------