X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=bd179cf8538ea9334018a94dcf5e243bbe646c48;hb=eda9bfda6d03f728b261824ca3b04f596485e288;hp=4dd664c87d0f1848a8873399745123b3c4c55e56;hpb=70b9dde9da207191fa6d799fdf03c2aff7941273;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 4dd664c8..bd179cf8 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/07 16:26:13 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2005/02/01 10:29:56 $
+  Version:   $Revision: 1.34 $
                                                                                 
   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,11 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
 void FillDefaultVRDict(VRHT &vr);
+
 //-----------------------------------------------------------------------------
+// Constructor / Destructor
 /**
  * \brief Constructor
  */
@@ -37,7 +40,7 @@ VR::VR()
    std::ifstream from(filename.c_str());
    if(!from)
    {
-      Debug::Verbose(2, "VR::VR: can't open dictionary", filename.c_str());
+      gdcmVerboseMacro("Can't open dictionary" << filename.c_str());
       FillDefaultVRDict(vr);
    }
    else
@@ -67,7 +70,6 @@ VR::VR()
    }
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief Destructor
  */
@@ -76,23 +78,6 @@ 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
 /**
@@ -104,17 +89,13 @@ int VR::Count(VRKey const &key)
    return vr.count(key);
 }
 
-//-----------------------------------------------------------------------------
 /**
- * \brief   Simple predicate that checks wether the given argument
+ * \brief   Simple predicate that checks whether the given argument
  *          corresponds to the Value Representation of a \ref BinEntry .
  * @param   tested value representation to check for.
  */
 bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
-   //   << tested << std::endl;
-
    if ( tested == GDCM_UNKNOWN)
       return true;
 
@@ -128,10 +109,10 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 }
 
 /**
- * \brief   Simple predicate that checks wether the given argument
+ * \brief   Simple predicate that checks whether the given argument
  *          corresponds to the Value Representation of a \ref ValEntry
  *          but NOT a \ref BinEntry.
- * @param   tested value representation to check for.
+ * @param   tested value representation to be checked.
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
@@ -156,7 +137,7 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
 }
 
 /**
- * \brief   Simple predicate that checks wether the given argument
+ * \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.
  */
@@ -167,7 +148,7 @@ bool VR::IsVROfSequence(VRKey const &tested)
 
 bool VR::IsValidVR(VRKey const &key)
 {
-   return(vr.find(key)!=vr.end());
+   return vr.find(key) != vr.end();
 }
 
 //-----------------------------------------------------------------------------
@@ -177,5 +158,21 @@ bool VR::IsValidVR(VRKey const &key)
 // 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