X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=7263a80e9ce97768cc639eb9b958a14bb49186a3;hb=224876ca6cbe71952f2a1d66d9853eca7745d3a0;hp=36aa38e2af16e073d6adbf3d38d34f9a11dd053c;hpb=057158e5e9575f1241d322989c673371d85b0e7d;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index 36aa38e2..7263a80e 100644 --- a/src/gdcmDataEntry.cxx +++ b/src/gdcmDataEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDataEntry.cxx,v $ Language: C++ - Date: $Date: 2006/07/04 09:36:18 $ - Version: $Revision: 1.40 $ + Date: $Date: 2007/10/30 09:14:41 $ + Version: $Revision: 1.51 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,12 +26,15 @@ #include #if defined(__BORLANDC__) - #include // for memcpy + #include // for memcpy #include // for atof - #include // for isdigit + #include // for isdigit #endif -namespace gdcm +// Could be defined like MAX_SIZE_LOAD_ELEMENT_VALUE +#define GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA 8 + +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- #define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff @@ -52,8 +55,10 @@ DataEntry::DataEntry(uint16_t group,uint16_t elem, State = STATE_LOADED; Flag = FLAG_NONE; - BinArea = 0; - SelfArea = true; + StrArea = 0; + StrHexaArea = 0; + BinArea = 0; + SelfArea = true; } /** @@ -66,6 +71,7 @@ DataEntry::DataEntry(DocEntry *e) { Flag = FLAG_NONE; BinArea = 0; + SelfArea = true; Copy(e); @@ -77,17 +83,18 @@ DataEntry::DataEntry(DocEntry *e) DataEntry::~DataEntry () { DeleteBinArea(); + } -//----------------------------------------------------------------------------- -// 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 ) { @@ -115,7 +122,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; } @@ -134,7 +141,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; } @@ -169,7 +176,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 @@ -193,13 +200,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" ) @@ -335,7 +340,7 @@ uint32_t DataEntry::GetValueCount( ) const } /** - * \brief Gets a std::vector holding the value(s) of a DS DataEntry + * \brief Gets a std::vector of 'double' holding the value(s) of a DS DataEntry * @param valueVector std::vector double of value(s) * \return false if VR not "DS" or DataEntry empty */ @@ -437,11 +442,15 @@ std::string const &DataEntry::GetString() const static std::ostringstream s; const VRKey &vr = GetVR(); s.str(""); - StrArea=""; + + if (!StrArea) + StrArea = new std::string(); + else + *StrArea=""; if( !BinArea ) - return StrArea; - // When short integer(s) are stored, convert the following (n * 2) characters + return *StrArea; + // 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" ) { @@ -452,7 +461,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if (vr == "SS" ) { @@ -463,7 +472,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } // See above comment on multiple short integers (mutatis mutandis). else if( vr == "UL" ) { @@ -474,7 +483,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if( vr == "SL" ) { @@ -485,8 +494,9 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); - } else if( vr == "FL" ) + *StrArea=s.str(); + } // 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++) @@ -495,8 +505,8 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); - } + *StrArea=s.str(); + } // See above comment on multiple short integers (mutatis mutandis). else if( vr == "FD" ) { double *data=(double *)BinArea; @@ -506,22 +516,131 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else { - StrArea.append((const char *)BinArea,GetLength()); + StrArea->append((const char *)BinArea,GetLength()); // to avoid gdcm to propagate oddities in lengthes if ( GetLength()%2) - StrArea.append(" ",1); } - return StrArea; + 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" ) + { + float *data=(float *)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 == "FD" ) + { + double *data=(double *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + s2 << std::setw( 8 ) << std::setfill( '0' ); + if( i!=0 ) + s2 << '\\'; + s2 << data[i]; + } + *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 * @param doc entry to copy from - * @remarks The content BinArea is copied too + * @remarks The content BinArea is copied too (StrArea is not) */ void DataEntry::Copy(DocEntry *doc) { @@ -532,18 +651,20 @@ void DataEntry::Copy(DocEntry *doc) { State = entry->State; Flag = entry->Flag; - CopyBinArea(entry->BinArea,entry->GetLength()); + CopyBinArea(entry->BinArea,entry->GetLength()); } } /** - * \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 ) { @@ -644,7 +765,9 @@ uint32_t DataEntry::ComputeFullLength() //----------------------------------------------------------------------------- // Protected -/// \brief Creates a DataEntry owned BinArea (remove previous one if any) + +/// \brief Creates a DataEntry owned BinArea +/// (remove previous one if any and relevant StrArea if any) void DataEntry::NewBinArea( ) { DeleteBinArea(); @@ -652,7 +775,8 @@ void DataEntry::NewBinArea( ) BinArea = new uint8_t[GetLength()]; SelfArea = true; } -/// \brief Removes the BinArea, if owned by the DataEntry +/// \brief Removes the BinArea, if owned by the DataEntry, +/// and the relevant StrArea if any void DataEntry::DeleteBinArea(void) { if (BinArea && SelfArea) @@ -660,6 +784,16 @@ void DataEntry::DeleteBinArea(void) delete[] BinArea; BinArea = NULL; } + if (StrArea) + { + delete StrArea; + StrArea = 0; + } + if (StrArea) + { + delete StrHexaArea; + StrHexaArea = 0; + } } //----------------------------------------------------------------------------- @@ -674,7 +808,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(); @@ -693,7 +829,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)) @@ -712,7 +848,7 @@ void DataEntry::Print(std::ostream &os, std::string const & ) } else { - s << " [gdcm::too long for print (" << cleanString.length() << ") ]"; + s << " [GDCM_NAME_SPACE::too long for print (" << cleanString.length() << ") ]"; } } else @@ -732,7 +868,7 @@ void DataEntry::Print(std::ostream &os, std::string const & ) else { s << " [" << GDCM_BINLOADED << ";" - << "length = " << GetLength() << "]"; + << "length = " << GetLength() << "] =0x(" << GetHexaRepresentation() << ")"; } } }