X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=037db638ea6d91394b33e68ab3f4284547e1993f;hb=4491b768d9529a24608e44d6ef77dc235d37dbb7;hp=19ac4d6553a8bfec46cb12edc0e5d934d1096a11;hpb=e8caac199c2683cb0f118c42c61dc6aec85b1eec;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 19ac4d65..037db638 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/16 04:50:41 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2005/01/30 17:30:57 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,6 +17,8 @@
 =========================================================================*/
 
 #include "gdcmBinEntry.h"
+#include "gdcmContentEntry.h"
+
 #include "gdcmDebug.h"
 
 #include <fstream>
@@ -32,7 +34,7 @@ namespace gdcm
 /**
  * \brief   Constructor from a given BinEntry
  */
-BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
+BinEntry::BinEntry(DictEntry *e) : ContentEntry(e)
 {
    BinArea = 0;
    SelfArea = true;
@@ -42,16 +44,9 @@ BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
  * \brief   Constructor from a given BinEntry
  * @param   e Pointer to existing Doc entry
  */
-BinEntry::BinEntry(DocEntry *e) : ValEntry(e->GetDictEntry())
+BinEntry::BinEntry(DocEntry *e) : ContentEntry(e->GetDictEntry())
 {
    Copy(e);
-/*   Length     = e->GetLength();
-   ReadLength = e->GetReadLength();
-   ImplicitVR = e->IsImplicitVR();
-   Offset     = e->GetOffset();*/
-
-   //FIXME
-   //SQDepthLevel = e->GetDepthLevel();
 
    BinArea = 0; // let's be carefull !
    SelfArea = true;
@@ -69,13 +64,13 @@ BinEntry::~BinEntry()
    }
 }
 
-
 //-----------------------------------------------------------------------------
 // Print
-/*
- * \brief   canonical Printer
+/**
+ * \brief   Prints a BinEntry (Dicom entry)
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
  */
- 
 void BinEntry::Print(std::ostream &os, std::string const & )
 {
    os << "B ";
@@ -98,16 +93,17 @@ void BinEntry::Print(std::ostream &os, std::string const & )
       {
          //s << " [gdcm::Binary data NOT loaded]";
          s << " [" <<GetValue() << "]";
-      }
-         
+      }         
    }
    os << s.str();
 }
 
-/*
+//-----------------------------------------------------------------------------
+// Public
+/**
  * \brief   canonical Writer
  * @param fp already open file pointer
- * @param filetype type of the file to be written
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
 */
 void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
 { 
@@ -121,7 +117,7 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
    // TODO FIME
    // Probabely, the same operation will have to be done when we want 
    // to write image with Big Endian Transfert Syntax, 
-   //   and we are working onj Little Endian Processor
+   //   and we are working on Little Endian Processor
 
 #ifdef GDCM_WORDS_BIGENDIAN
       // Be carefull with *any* 16 bits words 'binEntries !'
@@ -174,11 +170,10 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
       fp->seekp(lgr, std::ios::cur);
    }
 }
-//-----------------------------------------------------------------------------
-// Public
 
-
-/// \brief Sets the value (non string) of the current Dicom Header Entry
+/**
+ * \brief Sets the value (non string) of the current Dicom Header Entry
+ */
 void BinEntry::SetBinArea( uint8_t *area, bool self )  
 { 
    if (BinArea && SelfArea)