X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=9e35cc59477afef874e9f71c6d5b90cb2cb9c061;hb=331b611c7add834807f5b235ffc877ef6d0198ad;hp=ffe35271227937e25b63bbd54809c626217ad0ec;hpb=0b9f6c668266e8bcbfc0e3fb432c90f15e3a759d;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index ffe35271..9e35cc59 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/04/14 08:10:02 $ - Version: $Revision: 1.37 $ + Date: $Date: 2007/08/27 16:14:47 $ + Version: $Revision: 1.46 $ 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 @@ -40,8 +40,10 @@ uint32_t DataEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE; //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \brief Constructor for a given DictEntry - * @param e Pointer to existing dictionary entry + * \brief Constructor for a given DataEntry + * @param group group number of the Data Entry to be created + * @param elem element number of the Data Entry to be created + * @param vr Value Representation of the Data Entry to be created */ DataEntry::DataEntry(uint16_t group,uint16_t elem, VRKey const &vr) @@ -50,6 +52,7 @@ DataEntry::DataEntry(uint16_t group,uint16_t elem, State = STATE_LOADED; Flag = FLAG_NONE; + StrArea = 0; BinArea = 0; SelfArea = true; } @@ -64,6 +67,7 @@ DataEntry::DataEntry(DocEntry *e) { Flag = FLAG_NONE; BinArea = 0; + SelfArea = true; Copy(e); @@ -75,6 +79,7 @@ DataEntry::DataEntry(DocEntry *e) DataEntry::~DataEntry () { DeleteBinArea(); + } //----------------------------------------------------------------------------- @@ -85,7 +90,10 @@ DataEntry::~DataEntry () /** * \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 ) { @@ -113,7 +121,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; } @@ -132,7 +140,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; } @@ -167,7 +175,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 @@ -191,13 +199,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" ) @@ -333,8 +339,8 @@ uint32_t DataEntry::GetValueCount( ) const } /** - * \brief Gets a std::vector holding the value(s) of a DS DataEntry - * @param valueVector std::vector of value(s) + * \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 */ bool DataEntry::GetDSValue(std::vector &valueVector) @@ -364,7 +370,6 @@ uint32_t DataEntry::GetValueCount( ) const void DataEntry::SetString(std::string const &value) { DeleteBinArea(); - const VRKey &vr = GetVR(); if ( vr == "US" || vr == "SS" ) { @@ -415,16 +420,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; } @@ -436,10 +441,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" ) @@ -451,7 +460,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if (vr == "SS" ) { @@ -462,7 +471,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" ) { @@ -473,7 +482,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if( vr == "SL" ) { @@ -484,7 +493,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; @@ -494,7 +503,7 @@ std::string const &DataEntry::GetString() const s << '\\'; s << data[i]; } - StrArea=s.str(); + *StrArea=s.str(); } else if( vr == "FD" ) { @@ -505,22 +514,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) { @@ -531,18 +540,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 ) { @@ -643,7 +654,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(); @@ -651,7 +663,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) @@ -659,6 +672,11 @@ void DataEntry::DeleteBinArea(void) delete[] BinArea; BinArea = NULL; } + if (StrArea) + { + delete StrArea; + StrArea = 0; + } } //----------------------------------------------------------------------------- @@ -711,7 +729,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