X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=25748140d092289c461e169b2856c6ca1ab6dcd6;hb=04f3bbda36168ed865e04de8b94d2c60206f962a;hp=22dbae3ca4d48ae2f19db5d7d5b56784afdd925d;hpb=eb427dc05df82e0d814ea43533e7711ba35d189a;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 22dbae3c..25748140 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/11/15 16:12:30 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2005/03/02 17:15:52 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,38 +17,38 @@
 =========================================================================*/
 
 #include "gdcmBinEntry.h"
-#include "gdcmDebug.h"
+#include "gdcmContentEntry.h"
+#include "gdcmUtil.h"
+
 #include <fstream>
+#include <sstream>
+#include <iostream> // for std::ios_base, since <ios> does not exist on gcc/Solaris
 
 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;
 }
 
 /**
  * \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())
 {
-   UsableLength = e->GetLength();
-   ReadLength   = e->GetReadLength();
-   ImplicitVR   = e->IsImplicitVR();
-   Offset       = e->GetOffset();
-   PrintLevel   = e->GetPrintLevel();
-   //FIXME
-   //SQDepthLevel = e->GetDepthLevel();
+   Copy(e);
 
-   BinArea = 0; // let's be carefull !
+   BinArea = 0;
+   SelfArea = true;
 }
 
 /**
@@ -56,28 +56,93 @@ BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
  */
 BinEntry::~BinEntry()
 {
-   if (BinArea)
+   if (BinArea && SelfArea)
    {
       delete[] BinArea;
       BinArea = 0; // let's be carefull !
    }
 }
 
+//-----------------------------------------------------------------------------
+// Public
+/**
+ * \brief   canonical Writer
+ * @param fp already open file pointer
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
+*/
+void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
+{ 
+   DocEntry::WriteContent(fp, filetype);
+   uint8_t* binArea8 = BinArea; //safe notation
+   size_t lgr = GetLength();
+   if (BinArea) // the binArea was *actually* loaded
+   {
+   /// \todo  Probably, the same operation should be done if we wanted 
+   ///        to write image with Big Endian Transfer Syntax, 
+   ///        while working on Little Endian Processor
+
+#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
+      /// \todo FIXME Right now, we only care of Pixels element
+      ///       we should deal with *all* the BinEntries
+      ///       well not really since we are not interpreting values read...
+
+      // 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW
+      // -value forced while Reading process-
+      if (GetGroup() == 0x7fe0 && GetVR() == "OW")
+      {     
+         uint16_t *binArea16 = (uint16_t*)binArea8;
+         binary_write (*fp, binArea16, lgr );
+      }
+      else
+      { 
+         // For any other VR, BinEntry is re-written as-is
+         binary_write (*fp, binArea8, lgr );
+      }
+#else
+      binary_write ( *fp, binArea8, lgr ); // Elem value
+#endif //GDCM_WORDS_BIGENDIAN
+
+   }
+   else
+   {
+      // nothing was loaded, but we need to skip space on disc
+      fp->seekp(lgr, std::ios::cur);
+   }
+}
+
+/**
+ * \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
 
+//-----------------------------------------------------------------------------
+// Private
+   
 //-----------------------------------------------------------------------------
 // Print
-/*
- * \brief   canonical Printer
+/**
+ * \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)
+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() << "]";
    }
@@ -89,54 +154,11 @@ void BinEntry::Print(std::ostream &os)
       }
       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
-
-//-----------------------------------------------------------------------------
-// Private
-   
 //-----------------------------------------------------------------------------
 } // end namespace gdcm