X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=33a302b73ea33184f8fcd3ef28d1131349b9452f;hb=97945d8b11b86924800fe1d78dcbf8a54be75927;hp=376e86f928c5cba60255be08ab9377e5aeb308ce;hpb=801fe2221ca70b34c5c644b6f522aa1b7233945b;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 376e86f9..33a302b7 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -1,40 +1,163 @@
-// gdcmBinEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmBinEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/10/11 14:48:19 $
+  Version:   $Revision: 1.80 $
+                                                                                
+  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 BinEntry
+ */
+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(gdcmDictEntry* e) : gdcmValEntry(e) {
+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
+   {
+
+   //  The same operation should be done if we wanted 
+   //  to write image with Big Endian Transfer Syntax, 
+   //  while working on Little Endian Processor
+   // --> forget Big Endian Transfer Syntax writting!
+   //     Next DICOM version will give it up ...
+
+   // -->
+   // --> FIXME 
+   // -->
+   // The stuff looks nice, but it's probably bugged,
+   // since troubles occur on big endian processors (SunSparc, Motorola)
+   // while reading the pixels of a 
+   // gdcm-written Little-Endian 16 bits per pixel image
+
+#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-
+      
+      //-->
+      // -->
+      // -->  WARNING
+      // -->        the following lines *looked* very clever, 
+      // -->        but they don't work on big endian processors.
+      // -->        since I've no access for the moment to a big endian proc :-(
+      // -->        I comment them out, to see the result on the dash board 
+      // -->     
+      
+      // --> Revert to initial code : TestWriteSimple hangs on Darwin :-(     
+      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 );
+      }
+            
+      //-->
+      // -->
+      // -->  WARNING      
+      // -->         remove the following line, an uncomment the previous ones, 
+      // -->         if it doesn't work better
+      // -->     
+      /*binary_write ( *fp, binArea8, lgr ); // Elem value*/
+      
+#else
+      binary_write ( *fp, binArea8, lgr ); // Elem value
+#endif //GDCM_WORDS_BIGENDIAN
+
+   }
+   else
+   {
+      // nothing was loaded, but we need to skip space on disc
+      
+      //  --> WARNING : nothing is written; 
+      //  --> the initial data (on the the source image) is lost
+      //  --> user is *not* informed !
+      
+      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
@@ -43,3 +166,75 @@ 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)
+   {
+      if ( GetVR() == "FL" )
+      {
+         int l = GetReadLength()/4 - 1;
+         float *beg = (float *)GetBinArea();
+         s << " [" << *beg;
+         if ( l!= 0)
+            for (int i=0;i<l;i++)
+            {
+               beg++;
+               s << "\\" << *beg;
+            }
+            s << "]";
+      }
+      else if ( GetVR() == "FD" )
+      {
+         int l = GetReadLength()/8 - 1;
+         double *beg = (double *)GetBinArea();
+         s << " [" << *beg;
+         if ( l!= 0)
+            for (int i=0;i<l;i++)
+            {
+               beg++;
+               s << "\\" << *beg;
+            }
+            s << "]";
+      }
+      else
+      { 
+         if ( Util::IsCleanArea( GetBinArea(),GetLength()  ) )
+         {
+            std::string cleanString = 
+                   Util::CreateCleanString( GetBinArea(),GetLength()  );
+            s << " [" << cleanString << "]";
+         }
+         else
+         {
+            //s << " [" << GetValue()
+            s << " [" << GDCM_BINLOADED << ";"
+              << "length = " << GetLength() << "]";
+         } 
+      }
+   }
+   else
+   {
+      if ( GetLength() == 0 )
+      {
+         s << " []";
+      }
+      else 
+      {
+         s << " [" <<GetValue() << "]";
+      }         
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm