X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=833be232f3c7efc3d1f29f4f3fad5c568ca0987c;hb=fc4f7706c78baf3f60474c06d871b82db221f37b;hp=b46b6e7720b5271a183b458ca9d50c693a3a29ab;hpb=6aab4b42b524365bf70eaa80ad024f03a6a9b7bc;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index b46b6e77..833be232 100644 --- a/src/gdcmDataEntry.cxx +++ b/src/gdcmDataEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDataEntry.cxx,v $ Language: C++ - Date: $Date: 2007/06/04 13:40:01 $ - Version: $Revision: 1.43 $ + Date: $Date: 2008/04/10 12:15:35 $ + Version: $Revision: 1.54 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,6 +30,11 @@ #include // for atof #include // for isdigit #endif +#include // memcpy +#include // atof + +// Could be defined like MAX_SIZE_LOAD_ELEMENT_VALUE +#define GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA 8 namespace GDCM_NAME_SPACE { @@ -52,9 +57,10 @@ DataEntry::DataEntry(uint16_t group,uint16_t elem, State = STATE_LOADED; Flag = FLAG_NONE; - StrArea = 0; - BinArea = 0; - SelfArea = true; + StrArea = 0; + StrHexaArea = 0; + BinArea = 0; + SelfArea = true; } /** @@ -82,15 +88,15 @@ DataEntry::~DataEntry () } -//----------------------------------------------------------------------------- -// Print - //----------------------------------------------------------------------------- // Public /** * \brief Sets the value (non string) of the current DataEntry * @param area area - * @param self self + * @param self self=true : The area : *belongs" to the DataEntry + * : will be delete with the DataEntry + * self=false The area *is not* deleted with the DataEntry + * */ void DataEntry::SetBinArea( uint8_t *area, bool self ) { @@ -118,7 +124,7 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length ) NewBinArea(); memcpy(BinArea,area,length); if( length!=lgh ) - BinArea[length]=0; + BinArea[length]=0; // padd with zero State = STATE_LOADED; } @@ -137,7 +143,7 @@ void DataEntry::SetValue(const uint32_t &id, const double &val) if( id > GetValueCount() ) { - gdcmErrorMacro("Index (" << id << ")is greater than the data size"); + gdcmErrorMacro("Index (" << id << ") is greater than the data size"); return; } @@ -172,7 +178,7 @@ void DataEntry::SetValue(const uint32_t &id, const double &val) } } /** - * \brief returns, as a double (?!?) one of the values + * \brief returns, as a double one of the values * (when entry is multivaluated), identified by its index. * Returns 0.0 if index is wrong * @param id id @@ -196,13 +202,11 @@ double DataEntry::GetValue(const uint32_t &id) const return 0.0; } - /// \todo FIX the API : user *knows* that entry contains a US - /// and he receives a double ?!? + // if user *knows* that entry contains a US, + // he just has to cast the double he receives const VRKey &vr = GetVR(); - /// \todo FIX the API : user *knows* that entry contains a US, - /// the method is supposed to return a double - /// but sends a US ?!? + if( vr == "US" || vr == "SS" ) return ((uint16_t *)BinArea)[id]; else if( vr == "UL" || vr == "SL" ) @@ -425,10 +429,12 @@ void DataEntry::SetString(std::string const &value) NewBinArea(); memcpy(BinArea, value.c_str(), l); if (l%2) // padded with blank except for UI - if ( vr == "UI" ) - BinArea[l] = '\0'; - else - BinArea[l] = ' '; + { + if ( vr == "UI" ) + BinArea[l] = '\0'; + else + BinArea[l] = ' '; + } } State = STATE_LOADED; } @@ -448,7 +454,7 @@ std::string const &DataEntry::GetString() const if( !BinArea ) return *StrArea; - // When short integer(s) are stored, convert the following (n * 2) characters + // When short integer(s) are stored, convert the following (n * 2) characters // as a displayable string, the values being separated by a back-slash if( vr == "US" ) { @@ -493,7 +499,8 @@ std::string const &DataEntry::GetString() const s << data[i]; } *StrArea=s.str(); - } else if( vr == "FL" ) + } // See above comment on multiple short integers (mutatis mutandis). + else if( vr == "FL" ) { float *data=(float *)BinArea; for (unsigned int i=0; i < GetValueCount(); i++) @@ -503,7 +510,7 @@ std::string const &DataEntry::GetString() const s << data[i]; } *StrArea=s.str(); - } + } // See above comment on multiple short integers (mutatis mutandis). else if( vr == "FD" ) { double *data=(double *)BinArea; @@ -520,10 +527,133 @@ std::string const &DataEntry::GetString() const StrArea->append((const char *)BinArea,GetLength()); // to avoid gdcm to propagate oddities in lengthes if ( GetLength()%2) - StrArea->append(" ",1); } + StrArea->append(" ",1); + } return *StrArea; } +/** + * \brief returns an hexadecimal representation of the DataEntry value + */ +std::string const &DataEntry::GetHexaRepresentation() const +{ + static std::ostringstream s2; + const VRKey &vr = GetVR(); + + s2.str(""); + if (!StrHexaArea) + StrHexaArea = new std::string(); + else + *StrHexaArea=""; + if( !BinArea ) + return *StrHexaArea; + // When short integer(s) are stored, convert the following (n * 2) characters + // as a displayable string, the values being separated by a back-slash + + s2 << std::hex; + + if( vr == "US" ) + { + uint16_t *data=(uint16_t *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + s2 << std::setw( 2 ) << std::setfill( '0' ); + if( i!=0 ) + s2 << '\\'; + s2 << data[i]; + } + *StrHexaArea=s2.str(); + } + else if (vr == "SS" ) + { + int16_t *data=(int16_t *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + s2 << std::setw( 4 ) << std::setfill( '0' ); + if( i!=0 ) + s2 << '\\'; + s2 << data[i]; + } + *StrHexaArea=s2.str(); + } // See above comment on multiple short integers (mutatis mutandis). + else if( vr == "UL" ) + { + uint32_t *data=(uint32_t *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + s2 << std::setw( 4 ) << std::setfill( '0' ); + if( i!=0 ) + s2 << '\\'; + s2 << data[i]; + } + *StrHexaArea=s2.str(); + } + else if( vr == "SL" ) + { + int32_t *data=(int32_t *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + s2 << std::setw( 4 ) << std::setfill( '0' ); + if( i!=0 ) + s2 << '\\'; + s2 << data[i]; + } + *StrHexaArea=s2.str(); + } + else if( vr == "FL" ) + { + unsigned char *toto=(unsigned char *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + s2.str(""); + if( i!=0 ) + s2 << '\\'; + unsigned int a4; + for(int iif=0; iif<4; iif++) + { + a4=toto[iif]; + s2 << a4; + } + } + *StrHexaArea=s2.str(); + } + else if( vr == "FD" ) + { + //double *data=(double *)BinArea; + unsigned char *toto=(unsigned char *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + s2.str(""); + if( i!=0 ) + s2 << '\\'; + //s2 << data[i]; + + unsigned int a4; + for(int iid=0; iid<8; iid++) + { + a4=toto[iid]; + s2 << a4; + } + + } + *StrHexaArea=s2.str(); + } + else + { + unsigned int l = (Length > GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA) ? GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA : Length; + uint8_t *data=(uint8_t *)BinArea; + for (unsigned int i=0; i < l; i++) + { + if( i!=0 ) + s2 << '\\'; + s2 << std::setw( 2 ) << (int)(data[i]); + } + if (Length > 16) + s2 << "\\..."; + *StrHexaArea=s2.str(); + } + return *StrHexaArea; +} /** * \brief Copies all the attributes from an other DocEntry @@ -544,13 +674,15 @@ void DataEntry::Copy(DocEntry *doc) } /** - * \brief Writes the 'value' area of a DataEntry + * \brief Writes the 'common part' + the 'value' area of a DataEntry * @param fp already open ofstream pointer * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ -void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) +void DataEntry::WriteContent(std::ofstream *fp, FileType filetype, + bool insideMetaElements, bool insideSequence) { - DocEntry::WriteContent(fp, filetype); + // writes the 'common part' + DocEntry::WriteContent(fp, filetype, insideMetaElements, insideSequence); if ( GetGroup() == 0xfffe ) { @@ -651,6 +783,7 @@ uint32_t DataEntry::ComputeFullLength() //----------------------------------------------------------------------------- // Protected + /// \brief Creates a DataEntry owned BinArea /// (remove previous one if any and relevant StrArea if any) void DataEntry::NewBinArea( ) @@ -674,6 +807,11 @@ void DataEntry::DeleteBinArea(void) delete StrArea; StrArea = 0; } + if (StrHexaArea) + { + delete StrHexaArea; + StrHexaArea = 0; + } } //----------------------------------------------------------------------------- @@ -688,7 +826,9 @@ void DataEntry::DeleteBinArea(void) */ void DataEntry::Print(std::ostream &os, std::string const & ) { - os << "D "; + //os << "D "; + + // First, Print the common part (vr [length offset] name). DocEntry::Print(os); uint16_t g = GetGroup(); @@ -707,7 +847,7 @@ void DataEntry::Print(std::ostream &os, std::string const & ) if( vr == "US" || vr == "SS" || vr == "UL" || vr == "SL" || vr == "FL" || vr == "FD") - s << " [" << GetString() << "]"; + s << " [" << GetString() << "] =0x(" << GetHexaRepresentation() << ")"; else { if(Global::GetVR()->IsVROfStringRepresentable(vr)) @@ -746,7 +886,7 @@ void DataEntry::Print(std::ostream &os, std::string const & ) else { s << " [" << GDCM_BINLOADED << ";" - << "length = " << GetLength() << "]"; + << "length = " << GetLength() << "] =0x(" << GetHexaRepresentation() << ")"; } } }