X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=3e150aaa6326f89ff05803af19ca2cd87f59c402;hb=9a1c462c4bd36bd29efc949d74332f3e19bb9638;hp=03a93ba24af4486b0e04fbafa99d31d955c0e31a;hpb=49c0af19f5bf0f2402d37d8abf7fb139e7453245;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 03a93ba2..3e150aaa 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 00:59:21 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/08/29 13:05:01 $
+  Version:   $Revision: 1.75 $
                                                                                 
   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.htm for details.
+  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
@@ -17,64 +17,172 @@
 =========================================================================*/
 
 #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 gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
+BinEntry::BinEntry(DictEntry *e) 
+         :ContentEntry(e)
 {
-   voidArea = NULL;
+   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())
+BinEntry::BinEntry(DocEntry *e) 
+        : ContentEntry(e->GetDictEntry())
 {
-   UsableLength = e->GetLength();
-   ReadLength   = e->GetReadLength();
-   ImplicitVR   = e->IsImplicitVR();
-   Offset       = e->GetOffset();
-   printLevel   = e->GetPrintLevel();
-   SQDepthLevel = e->GetDepthLevel();
+   Copy(e);
 
-   voidArea = NULL; // let's be carefull !
+   BinArea = 0;
+   SelfArea = true;
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry()
+BinEntry::~BinEntry()
 {
-   if (voidArea)
+   if (BinArea && SelfArea)
    {
-      free (voidArea);
-      voidArea = NULL; // let's be carefull !
+      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
+   {
+   /// \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 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 gdcmBinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os, std::string const & )
 {
-   gdcmDocEntry::Print(os);
+   os << "B ";
+   DocEntry::Print(os);
    std::ostringstream s;
-   void *voidArea = GetVoidArea();
-   if (voidArea)
+   void* binArea = GetBinArea();
+   if (binArea)
    {
-      s << " [gdcm::Binary data loaded with length is "
-        << 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()
+              << "; length = " << GetLength() << "]";
+         } 
+      }
    }
    else
    {
@@ -84,34 +192,11 @@ void gdcmBinEntry::Print(std::ostream &os)
       }
       else 
       {
-         s << " [gdcm::Binary data NOT loaded]";
-      }
-         
+         s << " [" <<GetValue() << "]";
+      }         
    }
    os << s.str();
 }
 
-/*
- * \brief   canonical Writer
- */
-void gdcmBinEntry::Write(FILE *fp, FileType filetype)
-{
-   gdcmDocEntry::Write(fp, filetype);
-   void *voidArea = GetVoidArea();
-   int lgr = GetLength();
-   if (voidArea)
-   {
-      // there is a 'non string' LUT, overlay, etc
-      fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
-   }
-}
-//-----------------------------------------------------------------------------
-// Public
-
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
-   
 //-----------------------------------------------------------------------------
+} // end namespace gdcm