X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmBinEntry.cxx;h=25748140d092289c461e169b2856c6ca1ab6dcd6;hb=7c8b232fb62e92da08750b81d3126651f60b8f3f;hp=4498e27fa085d2360ef094f2216db385de5c758a;hpb=75262e67ec39ad2f359c1efbf9ee805819a8e58a;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 4498e27f..25748140 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -1,55 +1,126 @@
-// gdcmBinEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmBinEntry.cxx,v $
+  Language:  C++
+  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
+  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 "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 gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e) {
-
+BinEntry::BinEntry(DictEntry *e) 
+         :ContentEntry(e)
+{
+   BinArea = 0;
+   SelfArea = true;
 }
 
 /**
- * \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()){
-   this->UsableLength = e->GetLength();
-	this->ReadLength   = e->GetReadLength();	
-	this->ImplicitVR   = e->IsImplicitVR();
-	this->Offset       = e->GetOffset();	
-	this->printLevel   = e->GetPrintLevel();	
-	this->SQDepthLevel = e->GetDepthLevel();	
-	
-   this->voidArea = NULL; // let's be carefull !
+BinEntry::BinEntry(DocEntry *e) 
+        : ContentEntry(e->GetDictEntry())
+{
+   Copy(e);
+
+   BinArea = 0;
+   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
+// 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 gdcmBinEntry::Print(std::ostream &os) {
-   PrintCommonPart(os);
-   std::cout << " gdcmBinEntry : Print, so WHAT ?" <<std::endl;
+void BinEntry::SetBinArea( uint8_t *area, bool self )  
+{ 
+   if (BinArea && SelfArea)
+      delete[] BinArea;
+
+   BinArea = area;
+   SelfArea=self;
 }
-//-----------------------------------------------------------------------------
-// Public
 
 //-----------------------------------------------------------------------------
 // Protected
@@ -58,3 +129,36 @@ void gdcmBinEntry::Print(std::ostream &os) {
 // Private
    
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \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, std::string const & )
+{
+   os << "B ";
+   DocEntry::Print(os);
+   std::ostringstream s;
+   void* binArea = GetBinArea();
+   if (binArea)
+   {
+      s << " [" << GetValue()
+        << "; length = " << GetLength() << "]";
+   }
+   else
+   {
+      if ( GetLength() == 0 )
+      {
+         s << " []";
+      }
+      else 
+      {
+         s << " [" <<GetValue() << "]";
+      }         
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm