X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=ffe35271227937e25b63bbd54809c626217ad0ec;hb=726b8eea9b427fb1e04e2cdf64933d0128f9e791;hp=e318600b245f02cd530f2854b4c410b92189823d;hpb=9dcd2e2063c6566193a7982c51f9551fa5f0ef3a;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index e318600b..ffe35271 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/09 12:23:38 $ - Version: $Revision: 1.25 $ + Date: $Date: 2006/04/14 08:10:02 $ + Version: $Revision: 1.37 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,6 +25,12 @@ #include +#if defined(__BORLANDC__) + #include // for memcpy + #include // for atof + #include // for isdigit +#endif + namespace gdcm { //----------------------------------------------------------------------------- @@ -37,8 +43,9 @@ uint32_t DataEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE; * \brief Constructor for a given DictEntry * @param e Pointer to existing dictionary entry */ -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; @@ -52,7 +59,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; @@ -75,7 +83,7 @@ DataEntry::~DataEntry () //----------------------------------------------------------------------------- // 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 */ @@ -89,7 +97,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 */ @@ -112,9 +120,9 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length ) } /** - * \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) { @@ -162,28 +170,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" ) @@ -194,6 +208,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 +257,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,8 +331,34 @@ uint32_t DataEntry::GetValueCount( ) const } return GetLength(); } + +/** + * \brief Gets a std::vector holding the value(s) of a DS DataEntry + * @param valueVector std::vector 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); @@ -383,7 +424,7 @@ void DataEntry::SetString(std::string const &value) memcpy(BinArea, value.c_str(), l); if (l%2) BinArea[l] = '\0'; - } + } } State = STATE_LOADED; } @@ -392,77 +433,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 @@ -495,7 +549,7 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) return; //delimitors have NO value } - // --> We only deal with Little Endian writting + // --> We only deal with Little Endian writting. // --> forget Big Endian Transfer Syntax writting! // Next DICOM version will give it up ... @@ -516,9 +570,9 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) uint8_t *data = BinArea; //safe notation size_t l = GetLength(); - gdcmDebugMacro ("in DataEntry::WriteContent " << GetKey() - << " : " << Global::GetVR()->GetAtomicElementLength(this->GetVR()) - ); +// 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) @@ -534,7 +588,6 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) } case 2: { -gdcmDebugMacro ("AtomicLength = 2 found; lgt =" << l); uint16_t *data16 = (uint16_t *)data; for(i=0;iseekp(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 } /** @@ -634,13 +690,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 {