X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=33a302b73ea33184f8fcd3ef28d1131349b9452f;hb=494aa96ecf94b849d344c999bfb061efbd942c87;hp=dd5c79719a62229c918ab9434f865d659d82a1bb;hpb=09df242a0fd3c71c18ca62fc0a8d87713f53e217;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index dd5c7971..33a302b7 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/14 15:06:37 $
-  Version:   $Revision: 1.47 $
+  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
@@ -17,7 +17,8 @@
 =========================================================================*/
 
 #include "gdcmBinEntry.h"
-#include "gdcmDebug.h"
+#include "gdcmContentEntry.h"
+#include "gdcmUtil.h"
 
 #include <fstream>
 #include <sstream>
@@ -25,14 +26,13 @@
 
 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;
@@ -42,18 +42,12 @@ BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
  * \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())
 {
    Copy(e);
-/*   Length     = e->GetLength();
-   ReadLength = e->GetReadLength();
-   ImplicitVR = e->IsImplicitVR();
-   Offset     = e->GetOffset();*/
-
-   //FIXME
-   //SQDepthLevel = e->GetDepthLevel();
 
-   BinArea = 0; // let's be carefull !
+   BinArea = 0;
    SelfArea = true;
 }
 
@@ -69,116 +63,93 @@ BinEntry::~BinEntry()
    }
 }
 
-
 //-----------------------------------------------------------------------------
-// Print
-/*
- * \brief   canonical Printer
- */
- 
-void BinEntry::Print(std::ostream &os)
-{
-   os << "B ";
-   DocEntry::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();
-}
-
-/*
+// Public
+/**
  * \brief   canonical Writer
  * @param fp already open file pointer
- * @param filetype type of the file to be written
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
 */
 void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
 { 
-#define BUFFER_SIZE 4096
    DocEntry::WriteContent(fp, filetype);
-   void* binArea = GetBinArea();
-   int lgr = GetLength();
-   if (binArea) // the binArea was *actually* loaded
+   uint8_t *binArea8 = BinArea; //safe notation
+   size_t lgr = GetLength();
+   if (BinArea) // the binArea was *actually* loaded
    {
 
-   // TODO FIME
-   // Probabely, the same operation will have to be done when we want 
-   // to write image with Big Endian Transfert Syntax, 
-   //   and we are working onj Little Endian Processor
+   //  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
 
-#ifdef GDCM_WORDS_BIGENDIAN
-      // Be carefull with *any* 16 bits words 'binEntries !'
-      // if ( GetVR() == "OW") // to be used later
+#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
 
-      // TODO FIXME Right now, we only care of Pixels element
+      /// \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")
-      {     
-         unit16_t *currPosition = (uint16_t *)binArea;
-
-         // TODO FIXME : Maybe we should allocate somewhere a static buffer,
-         // in order not to have to alloc/delete for almost every BinEntry ...
-         unit16_t *buffer = new uint16[BUFFER_SIZE];
-
-         // how many BUFFER_SIZE long pieces in binArea ?
-         int nbPieces = lgr/BUFFER_SIZE/2; //(16 bits = 2 Bytes)
-         for (int j=0;j<nbPieces;j++)
-         {
-            for (int i = 0; i < BUFFER_SIZE/2; i++)
-            {
-               buffer[i] =   (uint16_t *)binArea[i] >> 8 
-                           | (uint16_t *)binArea[i] << 8;  
-            }
-            fp->write ( (char*)currPosition, BUFFER_SIZE );
-            currPosition += BUFFER_SIZE/2;
-         }
-         int remainingSize = lgr%BUFFER_SIZE;
-         if ( remainingSize != 0)
-         {
-            fp->write ( (char*)currPosition, remainingSize );   
-         } 
-         delete buffer; 
+      
+      //-->
+      // -->
+      // -->  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
-         fp->write ( (char*)binArea, lgr );
+         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
-      fp->write ( (char*)binArea, lgr ); // Elem value
+      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);
    }
 }
-//-----------------------------------------------------------------------------
-// Public
 
-
-/// \brief Sets the value (non string) of the current Dicom Header Entry
+/**
+ * \brief Sets the value (non string) of the current Dicom Header Entry
+ */
 void BinEntry::SetBinArea( uint8_t *area, bool self )  
 { 
    if (BinArea && SelfArea)
@@ -194,5 +165,76 @@ void BinEntry::SetBinArea( uint8_t *area, bool self )
 //-----------------------------------------------------------------------------
 // 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