X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=6dc581e8b040c535a63a81258bb9fde984a4ec8d;hb=2ee201a59464bbbd6d97c04b29746971567439d3;hp=a35ef4e7f22007b7a9d9535f88ede76df0536af0;hpb=bc69950a406d06c50f0fb75a96572784965cb534;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index a35ef4e7..6dc581e8 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/10/18 08:35:51 $ - Version: $Revision: 1.1 $ + Date: $Date: 2005/10/26 15:56:51 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -54,7 +54,7 @@ DataEntry::DataEntry(DictEntry *e) DataEntry::DataEntry(DocEntry *e) : DocEntry(e->GetDictEntry()) { - Flag = 0; + Flag = FLAG_NONE; BinArea = 0; SelfArea = true; @@ -86,7 +86,9 @@ void DataEntry::SetBinArea( uint8_t *area, bool self ) State = STATE_LOADED; } - +/** + * \brief Inserts the value (non string) into the current Dicom Header Entry + */ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length ) { DeleteBinArea(); @@ -105,7 +107,7 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length ) } } -void DataEntry::SetValue(const uint32_t &id,const double &val) +void DataEntry::SetValue(const uint32_t &id, const double &val) { if( !BinArea ) NewBinArea(); @@ -147,22 +149,30 @@ void DataEntry::SetValue(const uint32_t &id,const double &val) BinArea[id] = (uint8_t)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 ! + */ double DataEntry::GetValue(const uint32_t &id) const { if( !BinArea ) { gdcmErrorMacro("BinArea not set. Can't get the value"); - return 0; + return 0.0; } uint32_t count = GetValueCount(); if( id > count ) { gdcmErrorMacro("Index (" << id << ")is greater than the data size"); - return 0; + return 0.0; } + // FIX the API : user *knows* that entry contains a US + // and he receives a double ?!? + const VRKey &vr = GetVR(); if( vr == "US" || vr == "SS" ) return ((uint16_t *)BinArea)[id]; @@ -177,7 +187,7 @@ double DataEntry::GetValue(const uint32_t &id) const if( GetLength() ) { // Don't use std::string to accelerate processing - double val = 0.0; + double val; char *tmp = new char[GetLength()+1]; memcpy(tmp,BinArea,GetLength()); tmp[GetLength()]=0; @@ -196,7 +206,7 @@ double DataEntry::GetValue(const uint32_t &id) const { if( count == 0 ) { - tmp[i] = NULL; + tmp[i] = 0; break; } else @@ -219,7 +229,55 @@ double DataEntry::GetValue(const uint32_t &id) const return BinArea[id]; } -uint32_t DataEntry::GetValueCount(void) const +/** + * \brief Checks if the multiplicity of the value follows Dictionary VM + */ +bool DataEntry::IsValueCountValid() const +{ + bool valid; + uint32_t vm; + const std::string &strVM = GetVM(); + uint32_t vc = GetValueCount(); + + // FIXME : what shall we do with VM = "2-n", "3-n", etc + + if( strVM == "1-n" ) + { + // make sure it is at least one ??? FIXME + valid = vc >= 1 || vc == 0; + } + else + { + std::istringstream os; + os.str( strVM ); + os >> vm; + // Two cases: + // vm respect the one from the dict + // vm is 0 (we need to check if this element is allowed to be empty) FIXME + + // note (JPR) + // ---- + // Entries whose type is 1 are mandatory, with a mandatory value. + // Entries whose type is 1c are mandatory-inside-a-Sequence, + // with a mandatory value. + // Entries whose type is 2 are mandatory, with an optional value. + // Entries whose type is 2c are mandatory-inside-a-Sequence, + // with an optional value. + // Entries whose type is 3 are optional. + + // case vc == 0 is only applicable for 'type 2' entries. + // Problem : entry type may depend on the modality and/or the Sequence + // it's embedded in ! + // (Get the information in the 'Conformance Statements' ...) + valid = vc == vm || vc == 0; + } + return valid; +} + +/** + * \brief returns the number of elementary values + */ +uint32_t DataEntry::GetValueCount( ) const { const VRKey &vr = GetVR(); if( vr == "US" || vr == "SS" ) @@ -232,6 +290,8 @@ uint32_t DataEntry::GetValueCount(void) const return GetLength()/sizeof(double); else if( Global::GetVR()->IsVROfStringRepresentable(vr) ) { + // Some element in DICOM are allowed to be empty + if( !GetLength() ) return 0; // Don't use std::string to accelerate processing uint32_t count = 1; for(uint32_t i=0;i 0 ) { + // FIXME : should be quicker if we don't create one more std::string + // just to make even the length of a char array ... + + /* std::string finalVal = Util::DicomString( value.c_str() ); SetLength(finalVal.size()); NewBinArea(); memcpy(BinArea, &(finalVal[0]), finalVal.size()); + */ + + size_t l = value.size(); + SetLength(l + l%2); + NewBinArea(); + //memcpy(BinArea, &(value[0]), l); + memcpy(BinArea, value.c_str(), l); + if (l%2) + BinArea[l] = '\0'; } } State = STATE_LOADED; } - +/** + * \brief returns as a string (when possible) the value of the DataEntry + */ std::string const &DataEntry::GetString() const { static std::ostringstream s; @@ -322,12 +400,15 @@ std::string const &DataEntry::GetString() const 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 (int i=0; i < GetValueCount(); i++) + for (unsigned int i=0; i < GetValueCount(); i++) { if( i!=0 ) s << '\\'; @@ -335,12 +416,12 @@ std::string const &DataEntry::GetString() const } StrArea=s.str(); } - // See above comment on multiple integers (mutatis mutandis). + // See above comment on multiple short integers (mutatis mutandis). else if( vr == "UL" || vr == "SL" ) { uint32_t *data=(uint32_t *)BinArea; - for (int i=0; i < GetValueCount(); i++) + for (unsigned int i=0; i < GetValueCount(); i++) { if( i!=0 ) s << '\\'; @@ -352,7 +433,7 @@ std::string const &DataEntry::GetString() const { float *data=(float *)BinArea; - for (int i=0; i < GetValueCount(); i++) + for (unsigned int i=0; i < GetValueCount(); i++) { if( i!=0 ) s << '\\'; @@ -364,7 +445,7 @@ std::string const &DataEntry::GetString() const { double *data=(double *)BinArea; - for (int i=0; i < GetValueCount(); i++) + for (unsigned int i=0; i < GetValueCount(); i++) { if( i!=0 ) s << '\\'; @@ -377,7 +458,10 @@ std::string const &DataEntry::GetString() const return StrArea; } - +/** + * \brief Copies all the attributes from an other DocEntry + * @param doc entry to copy from + */ void DataEntry::Copy(DocEntry *doc) { DocEntry::Copy(doc); @@ -390,7 +474,11 @@ void DataEntry::Copy(DocEntry *doc) CopyBinArea(entry->BinArea,entry->GetLength()); } } - +/** + * \brief Writes the value 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) { DocEntry::WriteContent(fp, filetype); @@ -501,6 +589,12 @@ void DataEntry::Print(std::ostream &os, std::string const & ) os << "D "; DocEntry::Print(os); + uint16_t g = GetGroup(); + if (g == 0xfffe) // delimiters have NO value + { + return; // just to avoid identing all the remaining code + } + std::ostringstream s; TSAtr v; @@ -521,10 +615,15 @@ void DataEntry::Print(std::ostream &os, std::string const & ) { if(Global::GetVR()->IsVROfStringRepresentable(vr)) { - std::string cleanString = Util::CreateCleanString(v); // replace non printable characters by '.' + // replace non printable characters by '.' + std::string cleanString = Util::CreateCleanString(v); if ( cleanString.length() <= GetMaxSizePrintEntry() - || PrintLevel >= 3 - || IsNotLoaded() ) + || PrintLevel >= 3 + || IsNotLoaded() ) + // FIXME : when IsNotLoaded(), you create a Clean String ?!? + // FIXME : PrintLevel<2 *does* print the values + // (3 is only for extra offsets printing) + // What do you wanted to do ? JPR { s << " [" << cleanString << "]"; } @@ -535,8 +634,14 @@ void DataEntry::Print(std::ostream &os, std::string const & ) } else { - if ( Util::IsCleanArea( GetBinArea(),GetLength() ) ) + // A lot of Private elements (with no VR) contain actually + // only printable characters; + // Let's deal with them as is they were VR std::string representable + + if ( Util::IsCleanArea( GetBinArea(), GetLength() ) ) { + // FIXME : since the 'Area' *is* clean, just use + // a 'CreateString' method, to save CPU time. std::string cleanString = Util::CreateCleanString( BinArea,GetLength() ); s << " [" << cleanString << "]";