X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=d382e73ccfe09446eb5685fdcf62fdd3f5259954;hb=03acf3c119c6657129b8aeae8cb2205e481a105b;hp=376e86f928c5cba60255be08ab9377e5aeb308ce;hpb=801fe2221ca70b34c5c644b6f522aa1b7233945b;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 376e86f9..d382e73c 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -1,41 +1,142 @@
-// gdcmBinEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmBinEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/06 20:03:26 $
+  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
+  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
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmBinEntry.h"
+#include "gdcmDebug.h"
+#include <fstream>
+#include <iostream> // for std::ios_base, since <ios> does not exist on gcc/Solaris
 
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \brief   Constructor from a given gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e) {
+BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
+{
+   BinArea = 0;
+   SelfArea = true;
+}
 
+/**
+ * \brief   Constructor from a given BinEntry
+ * @param   e Pointer to existing Doc entry
+ */
+BinEntry::BinEntry(DocEntry *e) : ValEntry(e->GetDictEntry())
+{
+   UsableLength = e->GetLength();
+   ReadLength   = e->GetReadLength();
+   ImplicitVR   = e->IsImplicitVR();
+   Offset       = e->GetOffset();
+   //FIXME
+   //SQDepthLevel = e->GetDepthLevel();
+
+   BinArea = 0; // let's be carefull !
+   SelfArea = true;
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry(){
-   free (voidArea);
+BinEntry::~BinEntry()
+{
+   if (BinArea && SelfArea)
+   {
+      delete[] BinArea;
+      BinArea = 0; // let's be carefull !
+   }
 }
 
 
 //-----------------------------------------------------------------------------
 // Print
 /*
- * \ingroup gdcmDocEntry
  * \brief   canonical Printer
  */
  
-void gdcmBinEntry::Print(std::ostream &os) {
-   PrintCommonPart(os);
-   std::cout << " gdcmBinEntry : Print, so WHAT ?" <<std::endl;
+void BinEntry::Print(std::ostream &os)
+{
+   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();
+}
+
+/*
+ * \brief   canonical Writer
+ * @param fp already open file pointer
+ * @param filetype type of the file to be written
+*/
+void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
+{
+   DocEntry::WriteContent(fp, filetype);
+   void* binArea = GetBinArea();
+   int lgr = GetLength();
+   if (binArea)
+   {
+      // there is a 'non string' LUT, overlay, etc
+      fp->write ( (char*)binArea, lgr ); // Elem value
+      //assert( strlen((char*)binArea) == lgr );
+
+   }
+   else
+   {
+    // nothing was loaded, but we need to skip space on disc
+      fp->seekp(lgr, std::ios::cur);
+   }
 }
 //-----------------------------------------------------------------------------
 // Public
 
+
+/// \brief Sets the value (non string) of the current Dicom Header Entry
+void BinEntry::SetBinArea( uint8_t *area, bool self )  
+{ 
+   if (BinArea && SelfArea)
+      delete[] BinArea;
+
+   BinArea = area;
+   SelfArea=self;
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -43,3 +144,4 @@ void gdcmBinEntry::Print(std::ostream &os) {
 // Private
    
 //-----------------------------------------------------------------------------
+} // end namespace gdcm