X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=75b832796edd6507b153bee3c9c85af8bf9f7e2f;hb=1d6b53d6cc3487013b10aa9b604ae948585dbfb7;hp=db3461fe04fcf541021e1ba28cfa0065b0df53df;hpb=f5c7e83afd484a025285c64a09a89bd227087245;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index db3461fe..75b83279 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/18 14:28:32 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,6 +21,7 @@
 #include "gdcmVR.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <iomanip> // for std::ios::left, ...
 #include <fstream>
@@ -34,11 +35,10 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup DocEntry
  * \brief   Constructor from a given DictEntry
  * @param   in Pointer to existing dictionary entry
  */
-DocEntry::DocEntry(DictEntry* in)
+DocEntry::DocEntry(DictEntry *in)
 {
    ImplicitVR = false;
    DicomDict  = in;
@@ -47,17 +47,17 @@ DocEntry::DocEntry(DictEntry* in)
 
    // init some variables
    ReadLength = 0;
-   UsableLength = 0;
+   Length = 0;
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup DocEntry
  * \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)
+void DocEntry::Print(std::ostream &os, std::string const & )
 {
    size_t o;
    std::string st;
@@ -68,13 +68,15 @@ void DocEntry::Print(std::ostream& os)
 
    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 UsableLength
+      lgth = GetReadLength(); // ReadLength, as opposed to Length
       if (lgth == 0xffffffff)
       {
          st = Util::Format("x(ffff)");  // I said : "x(ffff)" !
@@ -113,18 +115,17 @@ void DocEntry::Print(std::ostream& os)
 }
 
 /**
- * \ingroup DocEntry
  * \brief   Writes the common part of any ValEntry, BinEntry, SeqEntry
  * @param fp already open file pointer
  * @param filetype type of the file to be written
  */
-void DocEntry::WriteContent(std::ofstream* fp, FileType filetype)
+void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
    uint32_t ffff  = 0xffffffff;
    uint16_t group = GetGroup();
    VRKey vr   = GetVR();
    uint16_t el    = GetElement();
-   uint32_t lgr   = GetReadLength();
+   uint32_t lgr   = GetLength();
 
    if ( group == 0xfffe && el == 0x0000 )
    {
@@ -163,7 +164,7 @@ void DocEntry::WriteContent(std::ofstream* fp, FileType filetype)
       uint16_t z = 0;
       uint16_t shortLgr = lgr;
 
-      if (vr == "unkn")
+      if (vr == GDCM_UNKNOWN)
       {
          // Unknown was 'written'
          // deal with Little Endian            
@@ -173,7 +174,7 @@ void DocEntry::WriteContent(std::ofstream* fp, FileType filetype)
       else
       {
          binary_write(*fp, vr);
-         assert( vr.size() == 2 );
+         gdcmAssertMacro( vr.size() == 2 );
                   
          if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
          {
@@ -213,7 +214,6 @@ void DocEntry::WriteContent(std::ofstream* fp, FileType filetype)
 // Public
 
 /**
- * \ingroup DocEntry
  * \brief   Gets the full length of the elementary DocEntry (not only value
  *          length) depending on the VR.
  */
@@ -239,21 +239,18 @@ uint32_t DocEntry::GetFullLength()
 }
 
 /**
- * \ingroup DocEntry
  * \brief   Copies all the attributes from an other DocEntry 
+ * @param e entry to copy from
  */
-void DocEntry::Copy (DocEntry* e)
+void DocEntry::Copy (DocEntry *e)
 {
-//   DicomDict    = e->DicomDict;
-   UsableLength = e->UsableLength;
-   ReadLength   = e->ReadLength;
-   ImplicitVR   = e->ImplicitVR;
-   Offset       = e->Offset;
-   // TODO : remove DocEntry SQDepth
+   Length     = e->Length;
+   ReadLength = e->ReadLength;
+   ImplicitVR = e->ImplicitVR;
+   Offset     = e->Offset;
 }
 
 /**
- * \ingroup DocEntry
  * \brief   tells us if entry is the last one of a 'no length' SequenceItem 
  *          (fffe,e00d) 
  */
@@ -262,7 +259,6 @@ bool DocEntry::IsItemDelimitor()
    return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
 }
 /**
- * \ingroup DocEntry
  * \brief   tells us if entry is the last one of a 'no length' Sequence 
  *          (fffe,e0dd) 
  */