X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=092c1ee18cd14d6407e7b2cb12ad41f4b354a441;hb=7eb058ef98b0003b379bf0db33e5c4c673b7f1e6;hp=ae4c5be868395906260f7a5a65a114f2a1d498bc;hpb=0accc3e4b95c96903d4fb6a792d657bf1e509375;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index ae4c5be8..092c1ee1 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/24 18:03:14 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/09/20 18:14:23 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@
  */
 gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
 {
-   this->voidArea = NULL;
+   VoidArea = 0;
 }
 
 /**
@@ -37,22 +37,27 @@ gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
  */
 gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(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 !
+   VoidArea = 0; // let's be carefull !
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry(){
-   if (voidArea)
-      free (voidArea);
+gdcmBinEntry::~gdcmBinEntry()
+{
+   if (VoidArea)
+   {
+      free (VoidArea);
+      VoidArea = 0; // let's be carefull !
+   }
 }
 
 
@@ -66,19 +71,23 @@ void gdcmBinEntry::Print(std::ostream &os)
 {
    gdcmDocEntry::Print(os);
    std::ostringstream s;
-   void *voidArea = GetVoidArea();	
-   if (voidArea != NULL)
+   void *voidArea = GetVoidArea();
+   if (voidArea)
    {
-      s << " [gdcm::Binary data loaded with length is "
-        << GetLength() << "]";
+      //s << " [" << GDCM_BINLOADED 
+      s << " [" << GetValue()
+        << "; length = " << GetLength() << "]";
    }
    else
    {
       if ( GetLength() == 0 )
+      {
          s << " []";
+      }
       else 
       {
-         s << " [gdcm::Binary data NOT loaded]";
+         //s << " [gdcm::Binary data NOT loaded]";
+         s << " [" <<GetValue() << "]";
       }
          
    }
@@ -87,20 +96,37 @@ void gdcmBinEntry::Print(std::ostream &os)
 
 /*
  * \brief   canonical Writer
- */
-void gdcmBinEntry::Write(FILE *fp, FileType filetype) {
+ * @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 *voidArea = GetVoidArea();
-   int lgr=GetLength();
-   if (voidArea != NULL) 
-   { // there is a 'non string' LUT, overlay, etc
+   int lgr = GetLength();
+   if (voidArea)
+   {
+      // there is a 'non string' LUT, overlay, etc
       fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
-      return;            
-   } 
+   }
+   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::SetVoidArea( void* area )  
+{ 
+   if (VoidArea)
+      free(VoidArea);
+   VoidArea = area;  
+}
+
 //-----------------------------------------------------------------------------
 // Protected