X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=2d7cfa9433a1e388766282828d546d7077082eb4;hb=879f56a62d0772c95e92d0657882eb1886b4153d;hp=5f313486e8e6065d719c6daaaca6605c57ba9bf6;hpb=44a9814938a6824d3a66b932429084517da6dadf;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 5f313486..2d7cfa94 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/13 12:10:53 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/10/10 00:42:54 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -48,13 +48,13 @@ gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in)
  * \brief   Prints the common part of gdcmValEntry, gdcmBinEntry, gdcmSeqEntry
  * @param   os ostream we want to print in
  */
-void gdcmDocEntry::Print(std::ostream & os)
+void gdcmDocEntry::Print(std::ostream& os)
 {
    PrintLevel = 2; // FIXME
    
    size_t o;
    unsigned short int g, e;
-   char st[20];
+   std::string st;
    TSKey v;
    std::string d2, vr;
    std::ostringstream s;
@@ -65,33 +65,33 @@ void gdcmDocEntry::Print(std::ostream & os)
    o  = GetOffset();
    vr = GetVR();
 
-   s << GetKey();
-       
+   s << gdcmDictEntry::TranslateToKey(GetGroup(),GetElement()); 
+
    if (PrintLevel >= 2)
    {
-      s << "lg : ";
+      s << " lg : ";
       lgth = GetReadLength(); // ReadLength, as opposed to UsableLength
       if (lgth == 0xffffffff)
       {
-         sprintf(st,"x(ffff)");  // I said : "x(ffff)" !
+         st = gdcmUtil::Format("x(ffff)");  // I said : "x(ffff)" !
          s.setf(std::ios::left);
-         s << std::setw(10-strlen(st)) << " ";  
+         s << std::setw(10-st.size()) << " ";  
          s << st << " ";
          s.setf(std::ios::left);
-         s << std::setw(8) << "-1";      
+         s << std::setw(8) << "-1"; 
       }
       else
       {
-         sprintf(st,"x(%x)",lgth);
+         st = gdcmUtil::Format("x(%x)",lgth);
          s.setf(std::ios::left);
-         s << std::setw(10-strlen(st)) << " ";  
+         s << std::setw(10-st.size()) << " ";
          s << st << " ";
          s.setf(std::ios::left);
          s << std::setw(8) << lgth; 
       }
       s << " Off.: ";
-      sprintf(st,"x(%x)",o); 
-      s << std::setw(10-strlen(st)) << " ";
+      st = gdcmUtil::Format("x(%x)",o); 
+      s << std::setw(10-st.size()) << " ";
       s << st << " ";
       s << std::setw(8) << o; 
    }
@@ -114,9 +114,9 @@ void gdcmDocEntry::Print(std::ostream & os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
  */
-void gdcmDocEntry::Write(FILE *fp, FileType filetype)
+void gdcmDocEntry::Write(FILE* fp, FileType filetype)
 {
-   uint32_t FFFF  = 0xffffffff;
+   uint32_t ffff  = 0xffffffff;
    uint16_t group = GetGroup();
    gdcmVRKey vr   = GetVR();
    uint16_t el    = GetElement();
@@ -130,9 +130,9 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype)
       return;
    }
 
-//
-// ----------- Writes the common part
-//
+   //
+   // ----------- Writes the common part
+   //
    fwrite ( &group,(size_t)2 ,(size_t)1 ,fp);  //group
    fwrite ( &el,   (size_t)2 ,(size_t)1 ,fp);  //element
       
@@ -149,7 +149,7 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype)
          //  - a new Item Delimitor Item is encountered (the Seq goes on)
          //  - a Sequence Delimitor Item is encountered (the Seq just ended)
 
-       // TODO : verify if the Sequence Delimitor Item was forced during Parsing 
+         // TODO : verify if the Sequence Delimitor Item was forced during Parsing 
 
          int ff = 0xffffffff;
          fwrite (&ff,(size_t)4 ,(size_t)1 ,fp);
@@ -178,7 +178,7 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype)
                // we set SQ length to ffffffff
                // and  we shall write a Sequence Delimitor Item 
                // at the end of the Sequence! 
-               fwrite ( &FFFF,(size_t)4 ,(size_t)1 ,fp);
+               fwrite ( &ffff,(size_t)4 ,(size_t)1 ,fp);
             }
             else
             {
@@ -195,7 +195,7 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype)
    { 
       if (vr == "SQ")
       {
-         fwrite ( &FFFF,(size_t)4 ,(size_t)1 ,fp);
+         fwrite ( &ffff,(size_t)4 ,(size_t)1 ,fp);
       }
       else
       {
@@ -209,7 +209,8 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype)
 
 /**
  * \ingroup gdcmDocEntry
- * \brief   Gets the full length of the elementary DocEntry (not only value length)
+ * \brief   Gets the full length of the elementary DocEntry (not only value
+ *          length) depending on the VR.
  */
 uint32_t gdcmDocEntry::GetFullLength()
 {