X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=d90383c0822c693e498073f278bb4a4969f5f22c;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=c8e5b4baa328e4057b3f83aa7d39c1a9646e9ec4;hpb=b616acd3a7a3dc34524e9f2482d70b25a6e1beff;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index c8e5b4ba..d90383c0 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/01/26 09:49:53 $
-  Version:   $Revision: 1.47 $
+  Date:      $Date: 2005/02/01 10:29:55 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,8 +28,7 @@
 
 namespace gdcm 
 {
-
-// CLEAN ME
+//-----------------------------------------------------------------------------
 #define MAX_SIZE_PRINT_ELEMENT_VALUE 64
 
 //-----------------------------------------------------------------------------
@@ -51,69 +50,7 @@ DocEntry::DocEntry(DictEntry *in)
 }
 
 //-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Prints the common part of ValEntry, BinEntry, SeqEntry
- * @param   os ostream we want to print in
- * @param indent Indentation string to be prepended during printing
- */
-void DocEntry::Print(std::ostream &os, std::string const & )
-{
-   size_t o;
-   std::string st;
-   TSKey v;
-   std::string d2, vr;
-   std::ostringstream s;
-   uint32_t lgth;
-
-   o  = GetOffset();
-   vr = GetVR();
-   if(vr==GDCM_UNKNOWN)
-      vr="  ";
-
-   s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
-
-   if (PrintLevel >= 2)
-   {
-      s << " lg : ";
-      lgth = GetReadLength(); // ReadLength, as opposed to Length
-      if (lgth == 0xffffffff)
-      {
-         st = Util::Format("x(ffff)");  // I said : "x(ffff)" !
-         s.setf(std::ios::left);
-         s << std::setw(10-st.size()) << " ";  
-         s << st << " ";
-         s.setf(std::ios::left);
-         s << std::setw(8) << "-1"; 
-      }
-      else
-      {
-         st = Util::Format("x(%x)",lgth);
-         s.setf(std::ios::left);
-         s << std::setw(10-st.size()) << " ";
-         s << st << " ";
-         s.setf(std::ios::left);
-         s << std::setw(8) << lgth; 
-      }
-      s << " Off.: ";
-      st = Util::Format("x(%x)",o); 
-      s << std::setw(10-st.size()) << " ";
-      s << st << " ";
-      s << std::setw(8) << o; 
-   }
-
-   s << "[" << vr  << "] ";
-
-   if (PrintLevel >= 1)
-   {
-      s.setf(std::ios::left);
-      s << std::setw(66-GetName().length()) << " ";
-   }
-    
-   s << "[" << GetName()<< "]";
-   os << s.str();      
-}
-
+// Public
 /**
  * \brief   Writes the common part of any ValEntry, BinEntry, SeqEntry
  * @param fp already open ofstream pointer
@@ -134,12 +71,11 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
      // we just *always* ignore spurious fffe|0000 tag !   
       return;
    }
-
    //
    // ----------- Writes the common part
    //
-   binary_write( *fp, group);  //group
-   binary_write( *fp, el);  //element
+   binary_write( *fp, group); //group
+   binary_write( *fp, el);    //element
 
    if ( filetype == ExplicitVR )
    {
@@ -207,9 +143,6 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    }
 }
 
-//-----------------------------------------------------------------------------
-// Public
-
 /**
  * \brief   Gets the full length of the elementary DocEntry (not only value
  *          length) depending on the VR.
@@ -237,14 +170,14 @@ uint32_t DocEntry::GetFullLength()
 
 /**
  * \brief   Copies all the attributes from an other DocEntry 
- * @param e entry to copy from
+ * @param doc entry to copy from
  */
-void DocEntry::Copy(DocEntry *e)
+void DocEntry::Copy(DocEntry *doc)
 {
-   Length     = e->Length;
-   ReadLength = e->ReadLength;
-   ImplicitVR = e->ImplicitVR;
-   Offset     = e->Offset;
+   Length     = doc->Length;
+   ReadLength = doc->ReadLength;
+   ImplicitVR = doc->ImplicitVR;
+   Offset     = doc->Offset;
 }
 
 /**
@@ -255,6 +188,7 @@ bool DocEntry::IsItemDelimitor()
 {
    return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
 }
+
 /**
  * \brief   tells us if entry is the last one of a 'no length' Sequence 
  *          (fffe,e0dd) 
@@ -267,10 +201,72 @@ bool DocEntry::IsSequenceDelimitor()
 //-----------------------------------------------------------------------------
 // Protected
 
-
 //-----------------------------------------------------------------------------
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Prints the common part of ValEntry, BinEntry, SeqEntry
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
+ */
+void DocEntry::Print(std::ostream &os, std::string const & )
+{
+   size_t o;
+   std::string st;
+   TSKey v;
+   std::string d2, vr;
+   std::ostringstream s;
+   uint32_t lgth;
 
+   o  = GetOffset();
+   vr = GetVR();
+   if(vr==GDCM_UNKNOWN)
+      vr="  ";
+
+   s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
+
+   if (PrintLevel >= 2)
+   {
+      s << " lg : ";
+      lgth = GetReadLength(); // ReadLength, as opposed to Length
+      if (lgth == 0xffffffff)
+      {
+         st = Util::Format("x(ffff)");  // I said : "x(ffff)" !
+         s.setf(std::ios::left);
+         s << std::setw(10-st.size()) << " ";  
+         s << st << " ";
+         s.setf(std::ios::left);
+         s << std::setw(8) << "-1"; 
+      }
+      else
+      {
+         st = Util::Format("x(%x)",lgth);
+         s.setf(std::ios::left);
+         s << std::setw(10-st.size()) << " ";
+         s << st << " ";
+         s.setf(std::ios::left);
+         s << std::setw(8) << lgth; 
+      }
+      s << " Off.: ";
+      st = Util::Format("x(%x)",o); 
+      s << std::setw(10-st.size()) << " ";
+      s << st << " ";
+      s << std::setw(8) << o; 
+   }
+
+   s << "[" << vr  << "] ";
+
+   if (PrintLevel >= 1)
+   {
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";
+   }
+    
+   s << "[" << GetName()<< "]";
+   os << s.str();      
+}
+
+//-----------------------------------------------------------------------------
 } // end namespace gdcm