STYLE: Cleanup

[gdcm.git] / src / gdcmBinEntry.cxx

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 3f2325e39bdac0d58f0ce7759df9b88394b1c41b..33a302b73ea33184f8fcd3ef28d1131349b9452f 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/25 13:45:40 $
-  Version:   $Revision: 1.73 $
+  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
@@ -73,23 +73,46 @@ BinEntry::~BinEntry()
 void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
 { 
    DocEntry::WriteContent(fp, filetype);
-   uint8_t* binArea8 = BinArea; //safe notation
+   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
+
+   //  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
+
+      /// \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...
+      ///       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 );
       }
@@ -98,6 +121,15 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
          // 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
@@ -106,6 +138,11 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
    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);
    }
 }
@@ -156,10 +193,33 @@ void BinEntry::Print(std::ostream &os, std::string const & )
             }
             s << "]";
       }
-      else
+      else if ( GetVR() == "FD" )
       {
-         s << " [" << GetValue()
-           << "; length = " << GetLength() << "]";
+         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