X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=77bbf2313bea542f05c03e027f7fcb9587f2307e;hb=97811f429fdf36ed2d7404e41ce7817c65e96e32;hp=65fefdb3ecff0bf59284dbc6995b2a94863a7126;hpb=a2040ffd26fc9a3c835b6c45b92a808f1d001b36;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 65fefdb3..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/01/05 15:38:28 $
-  Version:   $Revision: 1.24 $
+  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
@@ -26,8 +26,13 @@
 
 namespace gdcm 
 {
-void FillDefaultVRDict(VRHT & vr);
 //-----------------------------------------------------------------------------
+/// \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);
+
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
 /**
  * \brief Constructor
  */
@@ -35,9 +40,9 @@ VR::VR()
 {
    std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   if(!from)
+   if ( !from )
    {
-      dbg.Verbose(2, "VR::VR: can't open dictionary", filename.c_str());
+      gdcmWarningMacro("Can't open dictionary" << filename.c_str());
       FillDefaultVRDict(vr);
    }
    else
@@ -58,7 +63,7 @@ VR::VR()
          from >> std::ws;
          from.getline(buff, 1024, '\n');
    
-         if(key != "")
+         if ( key != "" )
          {
             vr[key] = name;
          }
@@ -67,7 +72,6 @@ VR::VR()
    }
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief Destructor
  */
@@ -76,103 +80,88 @@ VR::~VR()
    vr.clear();
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Print all 
- * @param   os The output stream to be written to.
- */
-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;
-   }
-   os << s.str();
-}
-
 //-----------------------------------------------------------------------------
 // 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 wether the given argument
- *          corresponds to the Value Representation of a \ref BinEntry .
- *          This predicate is the negation of
- *          \ref VR::IsVROfGdcmStringRepresentable .
+ * \brief   Simple predicate that checks whether the given argument
+ *          corresponds to the Value Representation of a \ref DataEntry .
  * @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 == GDCM_UNKNOWN)
-      return true;
-
-   if ( ! Count(tested) )
-   {
-      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+   //if ( tested == GDCM_UNKNOWN)
+   //{
+   //std::cout << "---------- never used --------------" << tested 
+   //          << std::endl;
+   //   return true;
+   //}
+
+   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.
+ * \brief   Simple predicate that checks whether the given argument
+ *          corresponds to the Value Representation of a representable
+ *          string.
+ * @param   tested value representation to be checked.
  */
-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 == "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" ;
+*/
+}
 
-   if ( ! Count(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;
+unsigned short VR::GetAtomicElementLength(VRKey const &vr)
+{
+   // 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;
 }
 
 //-----------------------------------------------------------------------------
@@ -182,5 +171,21 @@ bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Print all 
+ * @param   os The output stream to be written to.
+ */
+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;
+   }
+   os << s.str();
+}
 
+//-----------------------------------------------------------------------------
 } // end namespace gdcm