X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElValSet.cxx;h=91045a055093f03dfd8fddcedd534fef3ca0dfb2;hb=9ab2e9d4f106a4587c3d4f8f3de93def93e5b43e;hp=9b001c5d5563532e406415ada44597dfe2944c26;hpb=ee65673385a2d6192d7d64ed0339bd47515de805;p=gdcm.git diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx index 9b001c5d..91045a05 100644 --- a/src/gdcmElValSet.cxx +++ b/src/gdcmElValSet.cxx @@ -1,88 +1,231 @@ // gdcmElValSet.cxx -#include #include "gdcmUtil.h" #include "gdcmElValSet.h" +#include "gdcmTS.h" +#include -#define DEBUG 0 - +gdcmElValSet::~gdcmElValSet() { + for (TagElValueHT::iterator tag = tagHt.begin(); tag != tagHt.end(); ++tag) { + gdcmElValue* EntryToDelete = tag->second; + if ( EntryToDelete ) + delete EntryToDelete; + } + tagHt.clear(); + // Since Add() adds symetrical in both tagHt and NameHt we can + // assume all the pointed gdcmElValues are already cleaned-up when + // we cleaned tagHt. + NameHt.clear(); +} TagElValueHT & gdcmElValSet::GetTagHt(void) { return tagHt; } +/** + * \ingroup gdcmElValSet + * \brief + * @param newElValue + * @return + */ void gdcmElValSet::Add(gdcmElValue * newElValue) { tagHt [newElValue->GetKey()] = newElValue; NameHt[newElValue->GetName()] = newElValue; } -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() << "]"; - os << " lgr : " << tag->second->GetLength(); - os << endl; - } +/** + * \ingroup gdcmElValSet + * \brief Checks if a given Dicom element exists + * \ within a ElValSet + * @param Group + * @param Elem + * @return + */ +int gdcmElValSet::CheckIfExistByNumber(guint16 Group, guint16 Elem ) { + std::string key = TranslateToKey(Group, Elem ); + return (tagHt.count(key)); +} + +/** + * \ingroup gdcmElValSet + * \brief + */ +void gdcmElValSet::Print(std::ostream & os) { + + size_t o; + short int g, e; + TSKey v; + std::string d2; + gdcmTS * ts = gdcmGlobal::GetTS(); + + for (TagElValueHT::iterator tag = tagHt.begin(); + tag != tagHt.end(); + ++tag){ + g = tag->second->GetGroup(); + e = tag->second->GetElement(); + v = tag->second->GetValue(); + o = tag->second->GetOffset(); + d2 = _CreateCleanString(v); // replace non printable characters by '.' + + os << tag->first << ": "; + os << " lgr : " << tag->second->GetLength(); + os << ", Offset : " << o; + os << " x(" << std::hex << o << std::dec << ") "; + os << "\t[" << tag->second->GetVR() << "]"; + os << "\t[" << tag->second->GetName() << "]"; + os << "\t[" << d2 << "]"; + + // Display the UID value (instead of displaying the rough code) + if (g == 0x0002) { // Some more to be displayed ? + if ( (e == 0x0010) || (e == 0x0002) ) + os << " ==>\t[" << ts->GetValue(v) << "]"; + } else { + if (g == 0x0008) { + if ( (e == 0x0016) || (e == 0x1150) ) + os << " ==>\t[" << ts->GetValue(v) << "]"; + } + } + os << std::endl; + } } -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->GetVR() << "]" << endl; - } +/** + * \ingroup gdcmElValSet + * \brief + */ +void gdcmElValSet::PrintByName(std::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->GetVR() << "]" << std::endl; + } } +/** + * \ingroup gdcmElValSet + * \brief + * @param group + * @param element + * @return + */ gdcmElValue* gdcmElValSet::GetElementByNumber(guint16 group, guint16 element) { - TagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! tagHt.count(key)) - return (gdcmElValue*)0; - return tagHt.find(key)->second; + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + if ( ! tagHt.count(key)) + return (gdcmElValue*)0; + return tagHt.find(key)->second; } -gdcmElValue* gdcmElValSet::GetElementByName(string TagName) { +/** + * \ingroup gdcmElValSet + * \brief + * @return + */ +gdcmElValue* gdcmElValSet::GetElementByName(std::string TagName) { if ( ! NameHt.count(TagName)) return (gdcmElValue*)0; return NameHt.find(TagName)->second; } -string gdcmElValSet::GetElValueByNumber(guint16 group, guint16 element) { - TagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! tagHt.count(key)) - return "gdcm::Unfound"; - return tagHt.find(key)->second->GetValue(); +/** + * \ingroup gdcmElValSet + * \brief + * @param group + * @param element + * @return + */ +std::string gdcmElValSet::GetElValueByNumber(guint16 group, guint16 element) { + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + if ( ! tagHt.count(key)) + return GDCM_UNFOUND; + return tagHt.find(key)->second->GetValue(); } -string gdcmElValSet::GetElValueByName(string TagName) { - if ( ! NameHt.count(TagName)) - return "gdcm::Unfound"; - return NameHt.find(TagName)->second->GetValue(); +/** + * \ingroup gdcmElValSet + * \brief + * @return + */ +std::string gdcmElValSet::GetElValueByName(std::string TagName) { + if ( ! NameHt.count(TagName)) + return GDCM_UNFOUND; + return NameHt.find(TagName)->second->GetValue(); } - -int gdcmElValSet::SetElValueByNumber(string content, +/** + * \ingroup gdcmElValSet + * \brief + * @param content + * @param group + * @param element + * @return + */ +int gdcmElValSet::SetElValueByNumber(std::string content, guint16 group, guint16 element) { - TagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! tagHt.count(key)) - return 0; - tagHt[key]->SetValue(content); - tagHt[key]->SetLength(content.length()); - return 1; + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + if ( ! tagHt.count(key)) + return 0; + int l = content.length(); + if(l%2) { // Odd length are padded with a space (020H). + l++; + content = content + '\0'; + } + tagHt[key]->SetValue(content); + + std::string vr = tagHt[key]->GetVR(); + guint32 lgr; + + if( (vr == "US") || (vr == "SS") ) + lgr = 2; + else if( (vr == "UL") || (vr == "SL") ) + lgr = 4; + else + lgr = l; + tagHt[key]->SetLength(lgr); + + + + return 1; } -int gdcmElValSet::SetElValueByName(string content, string TagName) { - if ( ! NameHt.count(TagName)) - return 0; - NameHt[TagName]->SetValue(content); - NameHt[TagName]->SetLength(content.length()); - return 1; +/** + * \ingroup gdcmElValSet + * \brief + * @param content + * @param TagName + * @return + */ +int gdcmElValSet::SetElValueByName(std::string content, std::string TagName) { + if ( ! NameHt.count(TagName)) + return 0; + int l = content.length(); + if(l%2) { // Odd length are padded with a space (020H). + l++; + // Well. I know that '/0' is NOT a space + // but it doesn't work with a space. + // Use hexedit and see 0002|0010 value (Transfer Syntax UID) + content = content + '\0'; + } + NameHt[TagName]->SetValue(content); + + std::string vr = NameHt[TagName]->GetVR(); + guint32 lgr; + + if( (vr == "US") || (vr == "SS") ) + lgr = 2; + else if( (vr == "UL") || (vr == "SL") ) + lgr = 4; + else + lgr = content.length(); + +// TODO : WARNING: le cas de l'element des pixels (7fe0,0010) n'est pas traite +// par SetElValueByName +// il faudra utiliser SetElValueByNumber + + NameHt[TagName]->SetLength(lgr); + return 1; } /** @@ -101,123 +244,169 @@ guint32 gdcmElValSet::GenerateFreeTagKeyInGroup(guint16 group) { return UINT32_MAX; } +/** + * \ingroup gdcmElValSet + * \brief + * @param area + * @param group + * @param element + * @return + */ +int gdcmElValSet::SetVoidAreaByNumber(void * area, + guint16 group, guint16 element) { + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + if ( ! tagHt.count(key)) + return 0; + tagHt[key]->SetVoidArea(area); + return 1 ; +} + +/** + * \ingroup gdcmElValSet + * \brief + * @param length + * @param group + * @param element + * @return int acts as a boolean + */ int gdcmElValSet::SetElValueLengthByNumber(guint32 length, guint16 group, guint16 element) { - TagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! tagHt.count(key)) - return 0; - tagHt[key]->SetLength(length); - return 1 ; + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + if ( ! tagHt.count(key)) + return 0; + if (length%2) length++; // length must be even + tagHt[key]->SetLength(length); + return 1 ; } - - -int gdcmElValSet::SetElValueLengthByName(guint32 length, string TagName) { - if ( ! NameHt.count(TagName)) - return 0; - NameHt.find(TagName)->second->SetLength(length); - return 1 ; +/** + * \ingroup gdcmElValSet + * \brief + * @param length + * @param TagName + * @return + */ +int gdcmElValSet::SetElValueLengthByName(guint32 length, std::string TagName) { + if ( ! NameHt.count(TagName)) + return 0; + if (length%2) length++; // length must be even + NameHt.find(TagName)->second->SetLength(length); + return 1 ; } -void gdcmElValSet::UpdateGroupLength(bool SkipSequence) { - // On parcourt la table pour recalculer la longueur des 'elements 0x0000' - // au cas ou un tag ai été ajouté par rapport à ce qui a été lu - // dans l'image native - // - // cf : code IdDcmWriteFile dans libido/src/dcmwrite.c - - // On fait de l'implicit VR little Endian - // (pour moins se fairche sur processeur INTEL) - // On force le TRANSFERT SYNTAX UID +/** + * \ingroup gdcmElValSet + * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader + * @param SkipSequence TRUE if we don't want to write Sequences (ACR-NEMA Files) + * @param type + */ +void gdcmElValSet::UpdateGroupLength(bool SkipSequence, FileType type) { guint16 gr, el; - string vr; - guint32 lgrCalcGroupe=0; - gdcmElValue *elem, *elemZ, *elemZPrec; - guint16 grCourant = 0; - - TagElValueHT::iterator tag = tagHt.begin(); - - elem = tag->second; - gr = elem->GetGroup(); - el = elem->GetElement(); - - if (el != 0x0000) { - if(DEBUG)printf("ajout elem OOOO premiere fois\n"); - gdcmDictEntry * tagZ = new gdcmDictEntry(gr, 0x0000, "UL"); - elemZPrec = new gdcmElValue(tagZ); // on le cree - elemZPrec->SetLength(4); - Add(elemZPrec); // On l'accroche à sa place - } else { - elemZPrec = elem; - if(DEBUG)printf("Pas d'ajout elem OOOO premiere fois\n"); - } - lgrCalcGroupe = 0; - if(DEBUG)printf("init-1 lgr (%d) pour gr %04x\n",lgrCalcGroupe, gr); - grCourant = gr; - - for (tag = ++tagHt.begin(); - tag != tagHt.end(); - ++tag){ - - elem = tag->second; - gr = elem->GetGroup(); - el = elem->GetElement(); - vr = elem->GetVR(); - - if (SkipSequence && vr == "SQ") + std::string vr; + + gdcmElValue *elem; + char trash[10]; + std::string str_trash; + + GroupKey key; + GroupHT groupHt; // to hold the length of each group + TagKey tk; + // remember : + // typedef std::map GroupHT; + + gdcmElValue *elemZ; + + // for each Tag in the DCM Header + + 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; // generate 'group tag' + + // if the caller decided not to take SEQUENCEs into account + // e.g : he wants to write an ACR-NEMA File + + if (SkipSequence && vr == "SQ") continue; + + // Still unsolved problem : + // we cannot find the 'Sequence Delimitation Item' + // since it's at the end of the Hash Table + // (fffe,e0dd) + // pas SEQUENCE en ACR-NEMA - // WARNING : risque de pb - // si on est descendu 'a l'interieur' des SQ - continue; - // - // - if ( (gr != grCourant) /*&& // On arrive sur un nv Groupe - (el != 0xfffe) */ ) { - - if (el != 0x0000) { - gdcmDictEntry * tagZ = new gdcmDictEntry(gr, 0x0000, "UL"); - elemZ = new gdcmElValue(tagZ); // on le cree - elemZ->SetLength(4); - Add(elemZ); // On l'accroche à sa place - if(DEBUG)printf("ajout elem OOOO pour gr %04x\n",gr); - } else { - elemZ=elem; - if(DEBUG)printf("maj elemZ\n"); - } - - ostringstream f; - f << lgrCalcGroupe; - //sprintf(str_lgrCalcGroupe,"%d",lgrCalcGroupe); - elemZPrec->SetValue(f.str()); - if(DEBUG)printf("ecriture lgr (%d, %s) pour gr %04x\n",lgrCalcGroupe, f.str().c_str(), grCourant); - if(DEBUG)printf ("%04x %04x [%s]\n",elemZPrec->GetGroup(), elemZPrec->GetElement(), - elemZPrec->GetValue().c_str()); - if(DEBUG)cout << "Addresse elemZPrec " << elemZPrec<< endl; - elemZPrec=elemZ; - lgrCalcGroupe = 0; - grCourant = gr; - if(DEBUG)printf("init-2 lgr (%d) pour gr %04x\n",lgrCalcGroupe, gr); - } else { // On n'EST PAS sur un nv Groupe - lgrCalcGroupe += 2 + 2 + 4 + elem->GetLength(); // Gr + Num + Lgr + LgrElem - if(DEBUG)printf("increment (%d) el %04x-->lgr (%d) pour gr %04x\n", - elem->GetLength(), el, lgrCalcGroupe, gr); - } - } + // WARNING : + // --> la descente a l'interieur' des SQ + // devrait etre faite avec une liste chainee, pas avec une HTable... + + if ( groupHt.count(key) == 0) { // we just read the first elem of a given group + if (el == 0x0000) { // the first elem is 0x0000 + groupHt[key] = 0; // initialize group length + } else { + groupHt[key] = 2 + 2 + 4 + elem->GetLength(); // non 0x0000 first group elem + } + } else { // any elem but the first + if (type == ExplicitVR) { + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) { + groupHt[key] += 4; // explicit VR AND OB, OW, SQ : 4 more bytes + } + } + groupHt[key] += 2 + 2 + 4 + elem->GetLength(); + } + } + + unsigned short int gr_bid; + + for (GroupHT::iterator g = groupHt.begin(); // for each group we found + g != groupHt.end(); + ++g){ + // FIXME: g++ -Wall -Wstrict-prototypes reports on following line: + // warning: unsigned int format, different type arg + sscanf(g->first.c_str(),"%x",&gr_bid); + tk = g->first + "|0000"; // generate the element full tag + + if ( tagHt.count(tk) == 0) { // if element 0x0000 not found + gdcmDictEntry * tagZ = new gdcmDictEntry(gr_bid, 0x0000, "UL"); + elemZ = new gdcmElValue(tagZ); + elemZ->SetLength(4); + Add(elemZ); // create it + } else { + elemZ=GetElementByNumber(gr_bid, 0x0000); + } + sprintf(trash ,"%d",g->second); + str_trash=trash; + elemZ->SetValue(str_trash); + } } +/** + * \ingroup gdcmElValSet + * \brief + * @param type + * @param _fp + * @return + */ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { guint16 gr, el; guint32 lgr; const char * val; - string vr; + std::string vr; guint32 val_uint32; guint16 val_uint16; - - vector tokens; + + std::vector tokens; void *ptr; - // restent à tester les echecs en écriture (apres chaque fwrite) - for (TagElValueHT::iterator tag2 = tagHt.begin(); + // Tout ceci ne marche QUE parce qu'on est sur un proc Little Endian + // restent a tester les echecs en ecriture (apres chaque fwrite) + + for (TagElValueHT::iterator tag2=tagHt.begin(); tag2 != tagHt.end(); ++tag2){ @@ -226,20 +415,21 @@ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { lgr = tag2->second->GetLength(); val = tag2->second->GetValue().c_str(); vr = tag2->second->GetVR(); - if(DEBUG)printf ("%04x %04x [%s] : [%s]\n",gr, el, vr.c_str(), val); + + // std::cout << "Tag "<< std::hex << gr << " " << el << std::endl; if ( type == ACR ) { - if (gr < 0x0008) continue; - if (gr %2) continue; - if (vr == "SQ" ) continue; + if (gr < 0x0008) continue; // ignore pure DICOM V3 groups + if (gr %2) continue; // ignore shadow groups + if (vr == "SQ" ) continue; // ignore Sequences + if (gr == 0xfffe ) continue; // ignore delimiters } - 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 + // EXPLICIT VR guint16 z=0, shortLgr; fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,_fp); @@ -251,60 +441,61 @@ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { shortLgr=lgr; fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp); } - } else { + } else { // IMPLICIT VR 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") { + tokens.erase(tokens.begin(),tokens.end()); // clean any previous value + Tokenize (tag2->second->GetValue(), tokens, "\\"); for (unsigned int i=0; isecond->GetValue(), tokens, "\\"); for (unsigned int i=0; i