X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=d15def828fbcb27e2a59ba0763fdebabd4be7cf1;hb=c460dc75a10d96fc38011db90fae5bcd8649b743;hp=63260fd4c4438e1d9a4f119abc2e74eff79588da;hpb=98b5c3d02083ad65fce19ff79007fcc3f370e7c5;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 63260fd4..d15def82 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -1,7 +1,23 @@
-// gdcmBinEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmBinEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/09/23 10:17:26 $
+  Version:   $Revision: 1.30 $
+                                                                                
+  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.
+                                                                                
+     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"
 
 
 //-----------------------------------------------------------------------------
@@ -10,32 +26,107 @@
 /**
  * \brief   Constructor from a given gdcmBinEntry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e) {
+gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
+{
+   BinArea = 0;
+}
+
+/**
+ * \brief   Constructor from a given gdcmBinEntry
+ * @param   e Pointer to existing Doc entry
+ */
+gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
+{
+   UsableLength = e->GetLength();
+   ReadLength   = e->GetReadLength();
+   ImplicitVR   = e->IsImplicitVR();
+   Offset       = e->GetOffset();
+   PrintLevel   = e->GetPrintLevel();
+   //FIXME
+   //SQDepthLevel = e->GetDepthLevel();
 
+   BinArea = 0; // let's be carefull !
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry(){
-   free (voidArea);
+gdcmBinEntry::~gdcmBinEntry()
+{
+   if (BinArea)
+   {
+      delete[] BinArea;
+      BinArea = 0; // let's be carefull !
+   }
 }
 
 
 //-----------------------------------------------------------------------------
 // Print
 /*
- * \ingroup gdcmDocEntry
  * \brief   canonical Printer
  */
  
-void gdcmBinEntry::Print(std::ostream &os = std::cout) {
-   PrintCommonPart(os);
-   std::cout << " gdcmBinEntry : Print, so WHAT ?" <<std::endl;
+void gdcmBinEntry::Print(std::ostream &os)
+{
+   gdcmDocEntry::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 gdcmBinEntry::Write(FILE *fp, FileType filetype)
+{
+   gdcmDocEntry::Write(fp, filetype);
+   void *binArea = GetBinArea();
+   int lgr = GetLength();
+   if (binArea)
+   {
+      // there is a 'non string' LUT, overlay, etc
+      fwrite ( binArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
+   }
+   else
+   {
+    // nothing was loaded, but we need to skip space on disc
+      fseek(fp,(size_t)lgr,SEEK_CUR); 
+   }
 }
 //-----------------------------------------------------------------------------
 // Public
 
+
+/// \brief Sets the value (non string) of the current Dicom Header Entry
+void gdcmBinEntry::SetBinArea( uint8_t* area )  
+{ 
+   if (BinArea)
+      delete[] BinArea;
+   BinArea = area;  
+}
+
 //-----------------------------------------------------------------------------
 // Protected