X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=e27e6982aeca670876a447f266fda95c11e6293d;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=ce75c594c4d383fe7e3fb79fd83836ae55c0fd7a;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index ce75c594..e27e6982 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/10/12 04:35:44 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/09/21 09:44:59 $
+  Version:   $Revision: 1.78 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,37 +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();
-
-   BinArea = 0; // let's be carefull !
+   Copy(e);
+
+   BinArea = 0;
+   SelfArea = true;
 }
 
 /**
@@ -55,30 +56,146 @@ 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
+   {
+
+   //  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-
+      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() << "]";
+      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
    {
@@ -88,52 +205,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(FILE* fp, FileType filetype)
-{
-   DocEntry::Write(fp, filetype);
-   void* binArea = GetBinArea();
-   int lgr = GetLength();
-   if (binArea)
-   {
-      // there is a 'non string' LUT, overlay, etc
-      fwrite ( binArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
-   }
-   else
-   {
-    // nothing was loaded, but we need to skip space on disc
-      fseek(fp,(size_t)lgr,SEEK_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