X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=ca55ae56e4811ac118fb79dbac28ba39c2ff59a2;hb=713d0f3d28a6176fab6d57e031633061dc7354a7;hp=3e4b3ca6a6a67dff866ac0d1d06cb56e6c191546;hpb=781b63053e9aa3fd4fc40689e191a38be1e758d4;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index 3e4b3ca6..ca55ae56 100644 --- a/src/gdcmDataEntry.cxx +++ b/src/gdcmDataEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDataEntry.cxx,v $ Language: C++ - Date: $Date: 2005/12/23 10:26:41 $ - Version: $Revision: 1.27 $ + Date: $Date: 2007/09/28 14:16:09 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,7 +25,16 @@ #include -namespace gdcm +#if defined(__BORLANDC__) + #include // for memcpy + #include // for atof + #include // for isdigit +#endif + +// 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 @@ -34,17 +43,22 @@ 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(DictEntry *e) - : DocEntry(e) +DataEntry::DataEntry(uint16_t group,uint16_t elem, + VRKey const &vr) + : DocEntry(group,elem,vr) { State = STATE_LOADED; Flag = FLAG_NONE; - BinArea = 0; - SelfArea = true; + StrArea = 0; + StrHexaArea = 0; + BinArea = 0; + SelfArea = true; } /** @@ -52,10 +66,12 @@ DataEntry::DataEntry(DictEntry *e) * @param e Pointer to existing Doc entry */ DataEntry::DataEntry(DocEntry *e) - : DocEntry(e->GetDictEntry()) + //: DocEntry(e->GetDictEntry()) + : DocEntry(e->GetGroup(),e->GetElement(), e->GetVR() ) { Flag = FLAG_NONE; BinArea = 0; + SelfArea = true; Copy(e); @@ -67,17 +83,18 @@ DataEntry::DataEntry(DocEntry *e) DataEntry::~DataEntry () { DeleteBinArea(); + } -//----------------------------------------------------------------------------- -// Print - //----------------------------------------------------------------------------- // Public /** - * \brief Sets the value (non string) of the current Dicom Header Entry + * \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 ) { @@ -89,7 +106,7 @@ void DataEntry::SetBinArea( uint8_t *area, bool self ) State = STATE_LOADED; } /** - * \brief Inserts the value (non string) into the current Dicom Header Entry + * \brief Inserts the value (non string) into the current DataEntry * @param area area * @param length length */ @@ -105,16 +122,16 @@ 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; } } /** - * \brief Inserts the value (non string) into the current Dicom Header Entry - * @param id id - * @param val val + * \brief Inserts the elementary (non string) value into the current DataEntry + * @param id index of the elementary value to be set + * @param val value, passed as a double */ void DataEntry::SetValue(const uint32_t &id, const double &val) { @@ -124,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; } @@ -159,31 +176,35 @@ 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 - * FIXME : warn the user there was a problem ! * @param id id */ double DataEntry::GetValue(const uint32_t &id) const { if( !BinArea ) { - gdcmErrorMacro("BinArea not set. Can't get the value"); + if (GetLength() != 0) // avoid stupid messages + /// \todo warn the user there was a problem ! + gdcmErrorMacro("BinArea not set " << std::hex + << GetGroup() << " " << GetElement() + << " Can't get the value"); return 0.0; } uint32_t count = GetValueCount(); if( id > count ) { - gdcmErrorMacro("Index (" << id << ")is greater than the data size"); + gdcmErrorMacro("Index (" << id << ") is greater than the data size"); return 0.0; } - // 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(); + if( vr == "US" || vr == "SS" ) return ((uint16_t *)BinArea)[id]; else if( vr == "UL" || vr == "SL" ) @@ -194,6 +215,7 @@ double DataEntry::GetValue(const uint32_t &id) const return ((double *)BinArea)[id]; else if( Global::GetVR()->IsVROfStringRepresentable(vr) ) { + // this is for VR = "DS", ... if( GetLength() ) { // Don't use std::string to accelerate processing @@ -242,7 +264,7 @@ double DataEntry::GetValue(const uint32_t &id) const /** * \brief Checks if the multiplicity of the value follows Dictionary VM */ -bool DataEntry::IsValueCountValid() const +bool DataEntry::IsValueCountValid() /*const*/ { uint32_t vm; const std::string &strVM = GetVM(); @@ -316,14 +338,39 @@ uint32_t DataEntry::GetValueCount( ) const } return GetLength(); } + /** - * \brief Sets the 'value' of an Entry, passed as a std::string + * \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) + { + /// \todo rewrite the whole method, in order *not to use* std::string ! + std::vector tokens; + + if (GetVR() != "DS") // never trust a user ! + return false; + + Util::Tokenize ( GetString().c_str(), tokens, "\\" ); + + int nbValues= tokens.size(); + if (nbValues == 0) + return false; + + for (int loop=0; loop 0 ) - { - 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; } @@ -392,81 +439,206 @@ void DataEntry::SetString(std::string const &value) */ std::string const &DataEntry::GetString() const { - static std::ostringstream s; - const VRKey &vr = GetVR(); - - s.str(""); - StrArea=""; - - if( !BinArea ) - 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" || vr == "SS" ) - { - uint16_t *data=(uint16_t *)BinArea; - - for (unsigned int i=0; i < GetValueCount(); i++) - { - if( i!=0 ) - s << '\\'; - s << data[i]; - } - StrArea=s.str(); + static std::ostringstream s; + const VRKey &vr = GetVR(); + s.str(""); + + if (!StrArea) + StrArea = new std::string(); + else + *StrArea=""; + + if( !BinArea ) + 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" ) + { + uint16_t *data=(uint16_t *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + if( i!=0 ) + s << '\\'; + s << data[i]; + } + *StrArea=s.str(); + } + else if (vr == "SS" ) + { + int16_t *data=(int16_t *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + if( i!=0 ) + s << '\\'; + s << data[i]; + } + *StrArea=s.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++) + { + if( i!=0 ) + s << '\\'; + s << data[i]; + } + *StrArea=s.str(); + } + else if( vr == "SL" ) + { + int32_t *data=(int32_t *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + if( i!=0 ) + s << '\\'; + s << data[i]; + } + *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++) + { + if( i!=0 ) + s << '\\'; + s << data[i]; + } + *StrArea=s.str(); + } // See above comment on multiple short integers (mutatis mutandis). + else if( vr == "FD" ) + { + double *data=(double *)BinArea; + for (unsigned int i=0; i < GetValueCount(); i++) + { + if( i!=0 ) + s << '\\'; + s << data[i]; + } + *StrArea=s.str(); + } + else + { + StrArea->append((const char *)BinArea,GetLength()); + // to avoid gdcm to propagate oddities in lengthes + if ( GetLength()%2) + StrArea->append(" ",1); } - // See above comment on multiple short integers (mutatis mutandis). - else if( vr == "UL" || vr == "SL" ) - { - uint32_t *data=(uint32_t *)BinArea; + return *StrArea; +} - for (unsigned int i=0; i < GetValueCount(); i++) - { +/** + * \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 ) - s << '\\'; - s << data[i]; - } - StrArea=s.str(); - } - else if( vr == "FL" ) - { - float *data=(float *)BinArea; - - for (unsigned int i=0; i < GetValueCount(); i++) - { + 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 ) - s << '\\'; - s << data[i]; - } - StrArea=s.str(); - } - else if( vr == "FD" ) - { - double *data=(double *)BinArea; - - for (unsigned int i=0; i < GetValueCount(); i++) - { + 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 ) - s << '\\'; - s << data[i]; - } - StrArea=s.str(); - } - else - { - StrArea.append((const char *)BinArea,GetLength()); - // to avoid gdcm propagate oddities in lengthes - if ( GetLength()%2) - StrArea.append(" ",1); + 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 StrArea; + 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) { @@ -477,18 +649,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 ) { @@ -516,9 +690,9 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) uint8_t *data = BinArea; //safe notation size_t l = GetLength(); - gdcmDebugMacro("in DataEntry::WriteContent " << GetKey() << " AtomicLength: " - << Global::GetVR()->GetAtomicElementLength(this->GetVR() ) // << " BinArea in :" << &BinArea - ); +// gdcmDebugMacro("in DataEntry::WriteContent " << GetKey() << " AtomicLength: " +// << Global::GetVR()->GetAtomicElementLength(this->GetVR() ) // << " BinArea in :" << &BinArea +// ); if (BinArea) // the binArea was *actually* loaded { #if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION) @@ -569,13 +743,13 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) // --> user is *not* informed ! gdcmDebugMacro ("Nothing was loaded, but we need to skip space on disc. " << "Length =" << l << " for " << GetKey() ); - fp->seekp(l, std::ios::cur); + fp->seekp(l, std::ios::cur); // At Write time, for unloaded elems } } // to avoid gdcm to propagate oddities // (length was already modified) if (l%2) - fp->seekp(1, std::ios::cur); + fp->seekp(1, std::ios::cur); // At Write time, for non even length elems } /** @@ -589,7 +763,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(); @@ -597,7 +773,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) @@ -605,6 +782,16 @@ void DataEntry::DeleteBinArea(void) delete[] BinArea; BinArea = NULL; } + if (StrArea) + { + delete StrArea; + StrArea = 0; + } + if (StrArea) + { + delete StrHexaArea; + StrHexaArea = 0; + } } //----------------------------------------------------------------------------- @@ -619,7 +806,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(); @@ -636,14 +825,9 @@ void DataEntry::Print(std::ostream &os, std::string const & ) v = GetString(); const VRKey &vr = GetVR(); - if( vr == "US" || vr == "SS" ) - s << " [" << GetString() << "]"; - else if( vr == "UL" || vr == "SL" ) - s << " [" << GetString() << "]"; - else if ( vr == "FL" ) - s << " [" << GetString() << "]"; - else if ( vr == "FD" ) - s << " [" << GetString() << "]"; + if( vr == "US" || vr == "SS" || vr == "UL" || vr == "SL" + || vr == "FL" || vr == "FD") + s << " [" << GetString() << "] =0x(" << GetHexaRepresentation() << ")"; else { if(Global::GetVR()->IsVROfStringRepresentable(vr)) @@ -662,7 +846,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 @@ -682,7 +866,7 @@ void DataEntry::Print(std::ostream &os, std::string const & ) else { s << " [" << GDCM_BINLOADED << ";" - << "length = " << GetLength() << "]"; + << "length = " << GetLength() << "] =0x(" << GetHexaRepresentation() << ")"; } } }