X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=182d7391a9fc56fe5bc3aef348d64f3697a5cf89;hb=41fcaa925770000d87082af846146bf7a8d4438d;hp=570c3c50d31633761a595b7cb8687a665e60b0bf;hpb=01f81453d85764007a1784d692635e404c3fe43f;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index 570c3c50..182d7391 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/06/29 13:26:08 $ - Version: $Revision: 1.39 $ + Date: $Date: 2007/07/26 08:36:49 $ + Version: $Revision: 1.44 $ 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,12 @@ #include #if defined(__BORLANDC__) - #include // for memcpy + #include // for memcpy #include // for atof - #include // for isdigit + #include // for isdigit #endif -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- #define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff @@ -52,6 +52,7 @@ DataEntry::DataEntry(uint16_t group,uint16_t elem, State = STATE_LOADED; Flag = FLAG_NONE; + StrArea = 0; BinArea = 0; SelfArea = true; } @@ -66,6 +67,7 @@ DataEntry::DataEntry(DocEntry *e) { Flag = FLAG_NONE; BinArea = 0; + SelfArea = true; Copy(e); @@ -77,6 +79,7 @@ DataEntry::DataEntry(DocEntry *e) DataEntry::~DataEntry () { DeleteBinArea(); + } //----------------------------------------------------------------------------- @@ -335,7 +338,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 */ @@ -366,7 +369,6 @@ uint32_t DataEntry::GetValueCount( ) const void DataEntry::SetString(std::string const &value) { DeleteBinArea(); - const VRKey &vr = GetVR(); if ( vr == "US" || vr == "SS" ) { @@ -417,16 +419,16 @@ void DataEntry::SetString(std::string const &value) tokens.clear(); } else - { - //if( value.size() > 0 ) // when user sets a string to 0, *do* the job. - { - size_t l = value.size(); - SetLength(l + l%2); - NewBinArea(); - memcpy(BinArea, value.c_str(), l); - if (l%2) + { + size_t l = value.size(); + SetLength(l + l%2); + 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] = ' '; } State = STATE_LOADED; } @@ -438,10 +440,14 @@ 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; + 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" ) @@ -453,7 +459,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if (vr == "SS" ) { @@ -464,7 +470,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" ) { @@ -475,7 +481,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if( vr == "SL" ) { @@ -486,7 +492,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if( vr == "FL" ) { float *data=(float *)BinArea; @@ -496,7 +502,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if( vr == "FD" ) { @@ -507,22 +513,22 @@ 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 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) { @@ -533,18 +539,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) { - DocEntry::WriteContent(fp, filetype); + // writes the 'common part' + DocEntry::WriteContent(fp, filetype, insideMetaElements); if ( GetGroup() == 0xfffe ) { @@ -645,7 +653,8 @@ 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(); @@ -653,7 +662,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) @@ -661,6 +671,11 @@ void DataEntry::DeleteBinArea(void) delete[] BinArea; BinArea = NULL; } + if (StrArea) + { + delete StrArea; + StrArea = 0; + } } //----------------------------------------------------------------------------- @@ -713,7 +728,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