X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=037db638ea6d91394b33e68ab3f4284547e1993f;hb=4491b768d9529a24608e44d6ef77dc235d37dbb7;hp=d7857acbe1652e8ce364fe1acd32c5fc35fd82f0;hpb=e49dda75179644e228e33af72931535878799dff;p=gdcm.git diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index d7857acb..037db638 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -1,37 +1,187 @@ -// gdcmBinEntry.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmBinEntry.cxx,v $ + Language: C++ + Date: $Date: 2005/01/30 17:30:57 $ + Version: $Revision: 1.59 $ + + 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.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmBinEntry.h" +#include "gdcmContentEntry.h" + +#include "gdcmDebug.h" + +#include +#include +#include // for std::ios_base, since does not exist on gcc/Solaris +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \brief Constructor from a given gdcmBinEntry + * \brief Constructor from a given BinEntry */ -gdcmBinEntry::gdcmBinEntry() : gdcmValEntry() { +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) : ContentEntry(e->GetDictEntry()) +{ + Copy(e); + + BinArea = 0; // let's be carefull ! + SelfArea = true; } /** * \brief Canonical destructor. */ -gdcmBinEntry::~gdcmBinEntry(){ - free (voidArea); +BinEntry::~BinEntry() +{ + if (BinArea && SelfArea) + { + delete[] BinArea; + BinArea = 0; // let's be carefull ! + } } - //----------------------------------------------------------------------------- // Print -/* - * \ingroup gdcmDocEntry - * \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, std::string const & ) +{ + 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 << " [" <> 8) | (binArea16[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; + } + else + { + // For any other VR, BinEntry is re-written as-is + fp->write ( (char*)binArea, lgr ); + } +#else + fp->write ( (char*)binArea, 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 @@ -40,3 +190,4 @@ gdcmBinEntry::~gdcmBinEntry(){ // Private //----------------------------------------------------------------------------- +} // end namespace gdcm