X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=e4460c60b12c365f6e3b306dee341bc7f762e131;hb=27607c280b744ce7de6a1698935181e66aa2f3e6;hp=62dfc3da21187abba740a477138e853116e160bf;hpb=9bc299b2b2e1b334a3bbfaf20aba3afa64d0f05b;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 62dfc3da..e4460c60 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/19 15:58:00 $
-  Version:   $Revision: 1.54 $
+  Date:      $Date: 2005/02/02 10:02:16 $
+  Version:   $Revision: 1.61 $
                                                                                 
   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>
@@ -25,14 +27,13 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-
 /**
  * \brief   Constructor from a given BinEntry
  */
-BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
+BinEntry::BinEntry(DictEntry *e) 
+         :ContentEntry(e)
 {
    BinArea = 0;
    SelfArea = true;
@@ -42,13 +43,11 @@ 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);
 
-   //FIXME
-   //SQDepthLevel = e->GetDepthLevel();
-
    BinArea = 0; // let's be carefull !
    SelfArea = true;
 }
@@ -65,45 +64,12 @@ BinEntry::~BinEntry()
    }
 }
 
-
 //-----------------------------------------------------------------------------
-// Print
-/*
- * \brief   canonical Printer
- */
- 
-void BinEntry::Print(std::ostream &os, std::string const & )
-{
-   os << "B ";
-   DocEntry::Print(os);
-   std::ostringstream s;
-   void* binArea = GetBinArea();
-   if (binArea)
-   {
-      //s << " [" << GDCM_BINLOADED 
-      s << " [" << GetValue()
-        << "; length = " << GetLength() << "]";
-   }
-   else
-   {
-      if ( GetLength() == 0 )
-      {
-         s << " []";
-      }
-      else 
-      {
-         //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)
 { 
@@ -117,7 +83,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 !'
@@ -170,11 +136,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)
@@ -190,5 +155,37 @@ void BinEntry::SetBinArea( uint8_t *area, bool self )
 //-----------------------------------------------------------------------------
 // Private
    
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \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 ";
+   DocEntry::Print(os);
+   std::ostringstream s;
+   void* binArea = GetBinArea();
+   if (binArea)
+   {
+      s << " [" << GetValue()
+        << "; length = " << GetLength() << "]";
+   }
+   else
+   {
+      if ( GetLength() == 0 )
+      {
+         s << " []";
+      }
+      else 
+      {
+         s << " [" <<GetValue() << "]";
+      }         
+   }
+   os << s.str();
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm