X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=f6645e7b28f5edc9704b6abcb3d7fa964041cbd7;hb=559c3639fc5b255b36a951f352db1addead9f78f;hp=aca20db63551838859222ae84214443dfb212958;hpb=57e3ee08a94dc1cd122a0b9c01f091e1b6913152;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index aca20db6..f6645e7b 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/21 12:38:28 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/11/03 20:52:12 $
+  Version:   $Revision: 1.35 $
                                                                                 
   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.htm for details.
+  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
@@ -18,41 +18,49 @@
 
 #include "gdcmBinEntry.h"
 #include "gdcmDebug.h"
+#include <fstream>
 
+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)
 {
-   this->voidArea = NULL;
+   BinArea = 0;
 }
 
 /**
- * \brief   Constructor from a given gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
+BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
 {
-   this->UsableLength = e->GetLength();
-   this->ReadLength   = e->GetReadLength();
-   this->ImplicitVR   = e->IsImplicitVR();
-   this->Offset       = e->GetOffset();
-   this->printLevel   = e->GetPrintLevel();
-   this->SQDepthLevel = e->GetDepthLevel();
+   UsableLength = e->GetLength();
+   ReadLength   = e->GetReadLength();
+   ImplicitVR   = e->IsImplicitVR();
+   Offset       = e->GetOffset();
+   PrintLevel   = e->GetPrintLevel();
+   //FIXME
+   //SQDepthLevel = e->GetDepthLevel();
 
-   this->voidArea = NULL; // let's be carefull !
+   BinArea = 0; // let's be carefull !
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry(){
-   if (voidArea)
-      free (voidArea);
+BinEntry::~BinEntry()
+{
+   if (BinArea)
+   {
+      delete[] BinArea;
+      BinArea = 0; // let's be carefull !
+   }
 }
 
 
@@ -62,26 +70,68 @@ gdcmBinEntry::~gdcmBinEntry(){
  * \brief   canonical Printer
  */
  
-void gdcmBinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os)
 {
-   gdcmValEntry::Print(os);
+   DocEntry::Print(os);
    std::ostringstream s;
-   if (voidArea != NULL)
+   void* binArea = GetBinArea();
+   if (binArea)
    {
-      s << " [gdcm::Binary data loaded with lenght is "
-        << GetLength() << "]"
-        << std::endl;
+      //s << " [" << GDCM_BINLOADED 
+      s << " [" << GetValue()
+        << "; length = " << GetLength() << "]";
    }
    else
    {
-      s << " [gdcm::Binary data NOT loaded]"
-        << std::endl;
+      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::Write(std::ofstream* fp, FileType filetype)
+{
+   DocEntry::Write(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_base::cur);
+   }
+}
 //-----------------------------------------------------------------------------
 // Public
 
+
+/// \brief Sets the value (non string) of the current Dicom Header Entry
+void BinEntry::SetBinArea( uint8_t* area )  
+{ 
+   if (BinArea)
+      delete[] BinArea;
+   BinArea = area;  
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -89,3 +139,4 @@ void gdcmBinEntry::Print(std::ostream &os)
 // Private
    
 //-----------------------------------------------------------------------------
+} // end namespace gdcm