X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=a1526820e5dca991408c68b9f4ee87c4e1b38cba;hb=35fea00ddb243a0d78fd679514995a8bb379803d;hp=a4cf42c2b7ba7bc38ebd1df042949bce330d7083;hpb=2974fc9af7458cd3a94251a12d4af74fefe22275;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index a4cf42c2..a1526820 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/11 16:28:04 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2005/08/28 16:57:36 $
+  Version:   $Revision: 1.65 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -175,6 +175,15 @@ bool DocEntry::IsItemDelimitor()
    return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
 }
 
+/**
+ * \brief   tells us if entry is the first one of an Item 
+ *          (fffe,e000) 
+ */
+bool DocEntry::IsItemStarter()
+{
+   return (GetGroup() == 0xfffe && GetElement() == 0xe000);
+}
+
 /**
  * \brief   tells us if entry is the last one of a 'no length' Sequence 
  *          (fffe,e0dd) 
@@ -222,11 +231,8 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    vr = GetVR();
    if ( vr==GDCM_UNKNOWN )
       vr="  ";
-   
-   char sKey[10];
-   sprintf(sKey,"%04x|%04x",GetGroup(),GetElement() );
-   // s << sKey;
-   //s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
+
+   s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
 
    if (PrintLevel >= 2)
    {
@@ -234,9 +240,10 @@ void DocEntry::Print(std::ostream &os, std::string const & )
       lgth = GetReadLength(); // ReadLength, as opposed to Length
       if (lgth == 0xffffffff)
       {
+         st = " ffff ";
          s.setf(std::ios::left);
-         s << std::setw(10-st.size());  
-         s << " ffff ";
+         s << std::setw(4);  
+         s << "    x(ffff) ";
          s.setf(std::ios::left);
          s << std::setw(8) << "-1"; 
       }
@@ -244,27 +251,33 @@ 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; 
    }
 
    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();      
 }