Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 16:39:18 $
- Version: $Revision: 1.38 $
+ 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
=========================================================================*/
#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;
}
}
}
-
//-----------------------------------------------------------------------------
-// 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::Write(std::ofstream* fp, FileType filetype)
-{
- DocEntry::Write(fp, filetype);
- void* binArea = GetBinArea();
- int lgr = GetLength();
- if (binArea)
+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
{
- // there is a 'non string' LUT, overlay, etc
- fp->write ( (char*)binArea, lgr ); // Elem value
- //assert( strlen((char*)binArea) == lgr );
+
+ // 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
- fp->seekp(lgr, std::ios_base::cur);
+ // 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
-void BinEntry::SetBinArea( uint8_t* area, bool self )
+/**
+ * \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;
//-----------------------------------------------------------------------------
// 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
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff