X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=570c3c50d31633761a595b7cb8687a665e60b0bf;hb=c1be9045c081451ec7bf104f23ed9701674339be;hp=1d8706f9596dce302f114a80b08d54af89ce1631;hpb=83d626ec3d3111a6d14586246b6e2dda56f0ab86;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index 1d8706f9..570c3c50 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/01/27 10:01:33 $ - Version: $Revision: 1.29 $ + Date: $Date: 2006/06/29 13:26:08 $ + Version: $Revision: 1.39 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -40,11 +40,14 @@ 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; @@ -58,7 +61,8 @@ 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; @@ -168,28 +172,34 @@ void DataEntry::SetValue(const uint32_t &id, const double &val) * \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 ?!? + /// \todo FIX the API : user *knows* that entry contains a US + /// and he receives a double ?!? 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" ) @@ -200,6 +210,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 @@ -248,7 +259,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(); @@ -322,6 +333,32 @@ uint32_t DataEntry::GetValueCount( ) const } return GetLength(); } + +/** + * \brief Gets a std::vector 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 ) + //if( value.size() > 0 ) // when user sets a string to 0, *do* the job. { size_t l = value.size(); SetLength(l + l%2); @@ -389,7 +426,7 @@ void DataEntry::SetString(std::string const &value) memcpy(BinArea, value.c_str(), l); if (l%2) BinArea[l] = '\0'; - } + } } State = STATE_LOADED; } @@ -398,77 +435,90 @@ 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(); - } - // See above comment on multiple short integers (mutatis mutandis). - else if( vr == "UL" || vr == "SL" ) - { - 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 == "FL" ) - { - float *data=(float *)BinArea; - - for (unsigned int i=0; i < GetValueCount(); i++) - { - 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++) - { - 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); - } - return StrArea; + 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" ) + { + 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(); + } 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(); + } + 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); } + return StrArea; } + /** * \brief Copies all the attributes from an other DocEntry * @param doc entry to copy from @@ -522,9 +572,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) @@ -575,13 +625,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 } /** @@ -642,13 +692,8 @@ 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" ) + if( vr == "US" || vr == "SS" || vr == "UL" || vr == "SL" + || vr == "FL" || vr == "FD") s << " [" << GetString() << "]"; else {