X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElValSet.cxx;h=ed07d4f1d77c0778fdffdba304e3d6f05af77024;hb=4a0c2407ec81e041c2e43781acec4c78c83fc487;hp=1f0760a448f97b47c66e5eadb4acc1024d4f6514;hpb=dc0c43e2f7912a4a0f70fc7f925c964823468f23;p=gdcm.git diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx index 1f0760a4..ed07d4f1 100644 --- a/src/gdcmElValSet.cxx +++ b/src/gdcmElValSet.cxx @@ -1,100 +1,313 @@ // gdcmElValSet.cxx -#include "gdcm.h" +#include #include "gdcmUtil.h" +#include "gdcmElValSet.h" -TagElValueHT & ElValSet::GetTagHt(void) { + +TagElValueHT & gdcmElValSet::GetTagHt(void) { return tagHt; } -void ElValSet::Add(ElValue * newElValue) { - tagHt[newElValue->GetKey()] = newElValue; +void gdcmElValSet::Add(gdcmElValue * newElValue) { + tagHt [newElValue->GetKey()] = newElValue; NameHt[newElValue->GetName()] = newElValue; } -void ElValSet::Print(ostream & os) { +void gdcmElValSet::Print(ostream & os) { for (TagElValueHT::iterator tag = tagHt.begin(); tag != tagHt.end(); ++tag){ os << tag->first << ": "; os << "[" << tag->second->GetValue() << "]"; os << "[" << tag->second->GetName() << "]"; - os << "[" << tag->second->GetVR() << "]" << endl; + os << "[" << tag->second->GetVR() << "]"; + os << " lgr : " << tag->second->GetLength(); + os << endl; } -} +} -void ElValSet::PrintByName(ostream & os) { +void gdcmElValSet::PrintByName(ostream & os) { for (TagElValueNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag){ os << tag->first << ": "; os << "[" << tag->second->GetValue() << "]"; - os << "[" << tag->second->GetKey() << "]"; + os << "[" << tag->second->GetKey() << "]"; os << "[" << tag->second->GetVR() << "]" << endl; } } -ElValue* ElValSet::GetElementByNumber(guint32 group, guint32 element) { +gdcmElValue* gdcmElValSet::GetElementByNumber(guint16 group, guint16 element) { TagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! tagHt.count(key)) - return (ElValue*)0; - if (tagHt.count(key) > 1) - dbg.Verbose(0, "ElValSet::GetElementByNumber", - "multiple entries for this key (FIXME) !"); + return (gdcmElValue*)0; return tagHt.find(key)->second; } -ElValue* ElValSet::GetElementByName(string TagName) { +gdcmElValue* gdcmElValSet::GetElementByName(string TagName) { if ( ! NameHt.count(TagName)) - return (ElValue*)0; - if (NameHt.count(TagName) > 1) - dbg.Verbose(0, "ElValSet::GetElement", - "multipe entries for this key (FIXME) !"); + return (gdcmElValue*)0; return NameHt.find(TagName)->second; } -string ElValSet::GetElValueByNumber(guint32 group, guint32 element) { +string gdcmElValSet::GetElValueByNumber(guint16 group, guint16 element) { TagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! tagHt.count(key)) return "gdcm::Unfound"; - if (tagHt.count(key) > 1) - dbg.Verbose(0, "ElValSet::GetElValueByNumber", - "multiple entries for this key (FIXME) !"); return tagHt.find(key)->second->GetValue(); } -int ElValSet::SetElValueByNumber(string content, guint32 group, guint32 element) { +string gdcmElValSet::GetElValueByName(string TagName) { + if ( ! NameHt.count(TagName)) + return "gdcm::Unfound"; + return NameHt.find(TagName)->second->GetValue(); +} + + +int gdcmElValSet::SetElValueByNumber(string content, + guint16 group, guint16 element) { TagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! tagHt.count(key)) return 0; - if (tagHt.count(key) > 1) { - dbg.Verbose(0, "ElValSet::SetElValueByNumber", - "multiple entries for this key (FIXME) !"); - return (0); - } - tagHt[key]->SetValue(content); - return(1); + tagHt[key]->SetLength(content.length()); + return 1; } -string ElValSet::GetElValueByName(string TagName) { +int gdcmElValSet::SetElValueByName(string content, string TagName) { if ( ! NameHt.count(TagName)) - return "gdcm::Unfound"; - if (NameHt.count(TagName) > 1) - dbg.Verbose(0, "ElValSet::GetElValue", - "multipe entries for this key (FIXME) !"); - return NameHt.find(TagName)->second->GetValue(); + return 0; + NameHt[TagName]->SetValue(content); + NameHt[TagName]->SetLength(content.length()); + return 1; } -int ElValSet::SetElValueByName(string content, string TagName) { - if ( ! NameHt.count(TagName)) +/** + * \ingroup gdcmElValSet + * \brief Generate a free TagKey i.e. a TagKey that is not present + * in the TagHt dictionary. + * @param group The generated tag must belong to this group. + * @return The element of tag with given group which is fee. + */ +guint32 gdcmElValSet::GenerateFreeTagKeyInGroup(guint16 group) { + for (guint32 elem = 0; elem < UINT32_MAX; elem++) { + TagKey key = gdcmDictEntry::TranslateToKey(group, elem); + if (tagHt.count(key) == 0) + return elem; + } + return UINT32_MAX; +} + +int gdcmElValSet::SetElValueLengthByNumber(guint32 length, + guint16 group, guint16 element) { + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + if ( ! tagHt.count(key)) return 0; - if (NameHt.count(TagName) > 1) { - dbg.Verbose(0, "ElValSet::SetElValue", - "multipe entries for this key (FIXME) !"); + tagHt[key]->SetLength(length); + return 1 ; +} + + +int gdcmElValSet::SetElValueLengthByName(guint32 length, string TagName) { + if ( ! NameHt.count(TagName)) return 0; - } - NameHt.find(TagName)->second->SetValue(content); + NameHt.find(TagName)->second->SetLength(length); + return 1 ; } + +void gdcmElValSet::UpdateGroupLength(bool SkipSequence, FileType type) { + guint16 gr, el; + string vr; + + gdcmElValue *elem; + char trash[10]; + string str_trash; + GroupKey key; + GroupHT groupHt; + TagKey tk; + gdcmElValue *elemZ; + + for (TagElValueHT::iterator tag2 = tagHt.begin(); + tag2 != tagHt.end(); + ++tag2){ + + elem = tag2->second; + gr = elem->GetGroup(); + el = elem->GetElement(); + vr = elem->GetVR(); + + sprintf(trash, "%04x", gr); + key = trash; + + if (SkipSequence && vr == "SQ") continue; + // pas SEQUENCE en ACR-NEMA + // WARNING : pb CERTAIN + // si on est descendu 'a l'interieur' des SQ + // + // --> la descente a l'interieur' des SQ + // devra etre faite avec une liste chainee, pas avec une HTable... + + if ( groupHt.count(key) == 0) { + if (el ==0x0000) { + groupHt[key] = 0; + } else { + groupHt[key] =2 + 2 + 4 + elem->GetLength(); + } + } else { + if (type = ExplicitVR) { + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) { + groupHt[key] += 4; + } + } + groupHt[key] += 2 + 2 + 4 + elem->GetLength(); + } + } + + if(0) + for (GroupHT::iterator g = groupHt.begin(); + g != groupHt.end(); + ++g){ + printf("groupKey %s : %d\n",g->first.c_str(),g->second); + } + + + unsigned short int gr_bid; + + for (GroupHT::iterator g = groupHt.begin(); + g != groupHt.end(); + ++g){ + + sscanf(g->first.c_str(),"%x",&gr_bid); + tk = g->first + "|0000"; + + if ( tagHt.count(tk) == 0) { + gdcmDictEntry * tagZ = new gdcmDictEntry(gr_bid, 0x0000, "UL"); + elemZ = new gdcmElValue(tagZ); + elemZ->SetLength(4); + Add(elemZ); + } else { + elemZ=GetElementByNumber(gr_bid, 0x0000); + } + sprintf(trash ,"%d",g->second); + str_trash=trash; + elemZ->SetValue(str_trash); + } +} + +void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { + guint16 gr, el; + guint32 lgr; + const char * val; + string vr; + guint32 val_uint32; + guint16 val_uint16; + + vector tokens; + + void *ptr; + + // Tout ceci ne marche QUE parce qu'on est sur un proc Little Endian + // restent à tester les echecs en écriture (apres chaque fwrite) + + for (TagElValueHT::iterator tag2=tagHt.begin(); + tag2 != tagHt.end(); + ++tag2){ + + gr = tag2->second->GetGroup(); + el = tag2->second->GetElement(); + lgr = tag2->second->GetLength(); + val = tag2->second->GetValue().c_str(); + vr = tag2->second->GetVR(); + + if ( type == ACR ) { + if (gr < 0x0008) continue; + if (gr %2) continue; + if (vr == "SQ" ) continue; + } + + fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp); //group + fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element + + if ( (type == ExplicitVR) && (gr <= 0x0002) ) { + // On est en EXPLICIT VR + guint16 z=0, shortLgr; + fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,_fp); + + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) { + fwrite ( &z, (size_t)2 ,(size_t)1 ,_fp); + fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); + + } else { + shortLgr=lgr; + fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp); + } + } else { + fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); + } + + tokens.erase(tokens.begin(),tokens.end()); + Tokenize (tag2->second->GetValue(), tokens, "\\"); + + if (vr == "US" || vr == "SS") { + for (unsigned int i=0; i