Some normalizations :

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 7b2543a7accdf9110b2f9ff7e48839fdaeab2761..2c589539a2026cf74977910f46d389c32378933b 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 22:19:48 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2005/01/23 10:12:34 $
+  Version:   $Revision: 1.49 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,10 +49,6 @@ ValEntry::ValEntry(DocEntry *e)
              : DocEntry(e->GetDictEntry())
 {
    Copy(e);
-/*   Length     = e->GetLength();
-   ReadLength = e->GetReadLength();
-   ImplicitVR = e->IsImplicitVR();
-   Offset     = e->GetOffset();*/
 }
 
 
@@ -66,16 +62,17 @@ ValEntry::~ValEntry ()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \brief   canonical Printer
+ * \brief   Prints the 'std::string representable' value of ValEntry
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
  */
-void ValEntry::Print(std::ostream &os)
+void ValEntry::Print(std::ostream &os, std::string const &)
 {
    uint16_t g = GetGroup();
    uint16_t e = GetElement();
-   std::string vr = GetVR();
+   VRKey vr = GetVR();
    std::ostringstream s; 
    std::string st;
-   TSKey v;
    std::string d2;
      
    os << "V ";
@@ -89,11 +86,11 @@ void ValEntry::Print(std::ostream &os)
    
    TS * ts = Global::GetTS();
     
-   v  = GetValue();  // not applicable for SQ ...     
+   TSAtr v  = GetValue();  // not applicable for SQ ...     
    d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
-   if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
-       //(PrintLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
-       (PrintLevel>=3)  || (d2.find(GDCM_NOTLOADED) < d2.length()) )
+   if( GetLength() <= MAX_SIZE_PRINT_ELEMENT_VALUE
+    || PrintLevel >= 3
+    || d2.find(GDCM_NOTLOADED) < d2.length() )
    {
       s << " [" << d2 << "]";
    }
@@ -107,7 +104,7 @@ void ValEntry::Print(std::ostream &os)
    if (g == 0x0002)
    {
       // Any more to be displayed ?
-      if ( (e == 0x0010) || (e == 0x0002) )
+      if ( e == 0x0010 || e == 0x0002 )
       {
          if ( v.length() != 0 )  // for brain damaged headers
          {
@@ -139,7 +136,7 @@ void ValEntry::Print(std::ostream &os)
       {
          if (g == 0x0004)
          {
-            if ( (e == 0x1510) || (e == 0x1512)  )
+            if ( e == 0x1510 || e == 0x1512  )
             {
                if ( v.length() != 0 )  // for brain damaged headers  
                {
@@ -154,7 +151,7 @@ void ValEntry::Print(std::ostream &os)
       }
    }
    //if (e == 0x0000) {        // elem 0x0000 --> group length 
-   if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") )
+   if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" )
    {
       if (v == "4294967295") // to avoid troubles in convertion 
       {
@@ -162,7 +159,7 @@ void ValEntry::Print(std::ostream &os)
       }
       else
       {
-         if ( GetLength() !=0 )
+         if ( GetLength() != 0 )
          {
             st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
          }
@@ -178,13 +175,19 @@ void ValEntry::Print(std::ostream &os)
 
 //-----------------------------------------------------------------------------
 // Public
+
+/**
+ * \brief   Sets the std::string representable' value of a ValEntry
+ * @param  val value to set 
+ */
+
 void ValEntry::SetValue(std::string const &val)
 {
    // Integers have a special treatement for their length:
    int l = val.length();
    if ( l != 0) // To avoid to be cheated by 'zero length' integers
    {   
-      VRKey vr = GetVR();
+      const VRKey &vr = GetVR();
       if( vr == "US" || vr == "SS" )
       {
          // for multivaluated items
@@ -218,8 +221,10 @@ void ValEntry::SetValue(std::string const &val)
    SetLength(l);
 }
 
-/*
- * \brief   canonical Writer
+/**
+ * \brief   Writes the std::string representable' value of a ValEntry
+ * @param fp already open ofstream pointer
+ * @param filetype type of the file to be written
  */
 void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
@@ -230,9 +235,10 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
       return; //delimitors have NO value
    }
 
-   std::string vr = GetVR();
+   const VRKey &vr = GetVR();
    unsigned int lgr = GetLength();
-   //std::cout<<std::hex<<GetGroup()<<"|"<<GetElement()<<std::dec<<" : "<<GetReadLength()<<" / "<<GetLength()<<"\n";
+   //std::cout<<std::hex<<GetGroup()<<"|"<<GetElement()
+   //         <<std::dec<<" : "<<GetReadLength()<<" / "<<GetLength()<<"\n";
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be mulivaluated