X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=f42fec4184e1698f187fb926fe7a61fe7c94cd8c;hb=605c1e647863a228b2f7a605f8f19bc5f9c9cc46;hp=a1936d0eb375e4c8281a54939d7517b08c3529b3;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index a1936d0e..f42fec41 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/02/05 01:37:09 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/09/06 15:36:02 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,6 +27,8 @@
 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);
 
 //-----------------------------------------------------------------------------
@@ -38,7 +40,7 @@ VR::VR()
 {
    std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   if(!from)
+   if ( !from )
    {
       gdcmWarningMacro("Can't open dictionary" << filename.c_str());
       FillDefaultVRDict(vr);
@@ -61,7 +63,7 @@ VR::VR()
          from >> std::ws;
          from.getline(buff, 1024, '\n');
    
-         if(key != "")
+         if ( key != "" )
          {
             vr[key] = name;
          }
@@ -80,14 +82,6 @@ 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
@@ -96,8 +90,12 @@ int VR::Count(VRKey const &key)
  */
 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;
@@ -116,6 +114,8 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
+
+/*
    return tested == "AE" ||
           tested == "AS" ||
           tested == "CS" ||
@@ -132,23 +132,17 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "TM" ||
           tested == "UI" ||
           tested == "UL" ||
-          tested == "UN" ||
-          tested == "US";
-}
+          tested == "US" ||
+          tested == "UT";
+*/
+   // Should be quicker 
 
-/**
- * \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";
-}
+   return tested != "FL" &&
+          tested != "FD" &&
+          tested != "OB" &&
+          tested != "OW" &&
+          tested != "SQ" ;
 
-bool VR::IsValidVR(VRKey const &key)
-{
-   return vr.find(key) != vr.end();
 }
 
 //-----------------------------------------------------------------------------