X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=85882a7ab2f6b27b24cadfcb60b174c17ec381e2;hb=eda9bfda6d03f728b261824ca3b04f596485e288;hp=ef4f9652a9e15d54fb81badc6467b3c5849065e8;hpb=7815fe9dc3532b716dc478ca0f255263f99d296f;p=gdcm.git diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index ef4f9652..85882a7a 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/16 16:30:32 $ - Version: $Revision: 1.22 $ + Date: $Date: 2005/02/02 18:13:57 $ + Version: $Revision: 1.64 $ 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,161 @@ =========================================================================*/ #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(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(); - - VoidArea = NULL; // let's be carefull ! + Copy(e); + + BinArea = 0; // let's be carefull ! + SelfArea = true; } /** * \brief Canonical destructor. */ -gdcmBinEntry::~gdcmBinEntry() +BinEntry::~BinEntry() { - if (VoidArea) + 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) +{ +#define BUFFER_SIZE 4096 + DocEntry::WriteContent(fp, filetype); + void* binArea = GetBinArea(); + int lgr = GetLength(); + if (binArea) // the binArea was *actually* loaded { - free (VoidArea); - VoidArea = NULL; // let's be carefull ! + + // TODO FIME + // Probabely, the same operation will have to be done when we want + // to write image with Big Endian Transfert Syntax, + // and we are working on Little Endian Processor + +/*#ifdef GDCM_WORDS_BIGENDIAN + // TODO FIXME Right now, we only care of Pixels element + + // 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW + // -value forced while Reading process- + if (GetGroup() == 0x7fe0 && GetVR() == "OW") + { + uint16_t *buffer = new uint16_t[BUFFER_SIZE]; + + // how many BUFFER_SIZE long pieces in binArea ? + int nbPieces = lgr/BUFFER_SIZE/2; //(16 bits = 2 Bytes) + int remainingSize = lgr%BUFFER_SIZE; + + uint16_t *binArea16 = (uint16_t*)binArea; + for (int j=0;j> 8) | (binArea16[i] << 8); + uint16_t val = binArea16[i]; + buffer[i] = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) ); + } + fp->write ( (char*)buffer, BUFFER_SIZE ); + binArea16 += BUFFER_SIZE/2; + } + if ( remainingSize > 0) + { + for (int i = 0; i < remainingSize/2; i++) + { + buffer[i] = (binArea16[i] >> 8) | (binArea16[i] << 8); + } + fp->write ( (char*)buffer, 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 +//----------------------------------------------------------------------------- +// 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() << "]"; + s << " [" << GetValue() + << "; length = " << GetLength() << "]"; } else { @@ -84,34 +181,11 @@ void gdcmBinEntry::Print(std::ostream &os) } else { - s << " [gdcm::Binary data NOT loaded]"; - } - + s << " [" <