Improve Print method

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index d8bb77755ae566ff4a39c0cc1c4c2e156b07bdca..3653e9fe1c2c78a827504425dcb29a9e836b9732 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/24 12:09:12 $
-  Version:   $Revision: 1.63 $
+  Date:      $Date: 2005/09/05 08:32:57 $
+  Version:   $Revision: 1.66 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -243,7 +243,7 @@ void DocEntry::Print(std::ostream &os, std::string const & )
          st = " ffff ";
          s.setf(std::ios::left);
          s << std::setw(4);  
-         s << "   x(ffff) ";
+         s << "    x(ffff) ";
          s.setf(std::ios::left);
          s << std::setw(8) << "-1"; 
       }
@@ -251,27 +251,35 @@ void DocEntry::Print(std::ostream &os, std::string const & )
       {
          st = Util::Format("x(%x)",lgth); // we may keep it
          s.setf(std::ios::left);
-         s << std::setw(10-st.size()) << " ";
+         s << std::setw(11-st.size()) << " ";
          s << st << " ";
          s.setf(std::ios::left);
          s << std::setw(8) << lgth; 
       }
       s << " Off.: ";
       st = Util::Format("x(%x)",o);  // we may keep it
-      s << std::setw(10-st.size()) << " ";
+      s << std::setw(11-st.size()) << " ";
       s << st << " ";
       s << std::setw(8) << o; 
    }
+   if (PrintLevel >= 1)
+      s << " ";
 
    s << "[" << vr  << "] ";
 
+   std::string name;
+   if ( GetElement() == 0x0000 )
+      name = "Group Length";
+   else
+      name = GetName();
+
    if (PrintLevel >= 1)
    {
       s.setf(std::ios::left);
-      s << std::setw(66-GetName().length()) << " ";
+      s << std::setw(66-name.length()) << " ";
    }
     
-   s << "[" << GetName()<< "]";
+   s << "[" << name << "]";
    os << s.str();      
 }