X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElValSet.cxx;h=db65110c41e5fc6839227524b0794e84d7248394;hb=da626417557034a6838c613ed1ccb1acc6864e9a;hp=5cc9841cd77cb397f66ffcdfe04b5d10643d27b4;hpb=1d7f7845726ab0b4e4630575f629a554d5707576;p=gdcm.git diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx index 5cc9841c..db65110c 100644 --- a/src/gdcmElValSet.cxx +++ b/src/gdcmElValSet.cxx @@ -3,86 +3,212 @@ #include #include "gdcmUtil.h" #include "gdcmElValSet.h" - -#define DEBUG 0 - +#include "gdcmTS.h" +using namespace std; + +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 allready cleaned-up when + // we cleaned tagHt. + NameHt.clear(); +} TagElValueHT & gdcmElValSet::GetTagHt(void) { return tagHt; } +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @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 + * @return + */ +int gdcmElValSet::CheckIfExistByNumber(guint16 Group, guint16 Elem ) { + string key = TranslateToKey(Group, Elem ); + return (tagHt.count(key)); +} + +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ + void gdcmElValSet::Print(ostream & os) { + + size_t o; + short int g, e; + TSKey v; + char * d; + 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(); + d = _CreateCleanString(v); // TODO : trouver qq chose moins goret + d2=d; + + os << tag->first << ": "; + //os << "[" << v << "]"; + os << "[" << d2 << "]"; + os << "[" << tag->second->GetName() << "]"; + os << "[" << tag->second->GetVR() << "]"; + + if ( (g == 0x0002) && (e == 0x0010) ) { + os << " [" << ts->GetValue(v) << "]"; + } + + // liberer 'd' ici ? + + os << " lgr : " << tag->second->GetLength(); + os << ", Offset : " << o; + os << " x(" << hex << o << dec << ") "; + os << 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 + * @param + * @return + */ + 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 + * @param + * @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; } +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ gdcmElValue* gdcmElValSet::GetElementByName(string TagName) { if ( ! NameHt.count(TagName)) return (gdcmElValue*)0; return NameHt.find(TagName)->second; } +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ 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(); + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + if ( ! tagHt.count(key)) + return "gdcm::Unfound"; + return tagHt.find(key)->second->GetValue(); } +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ string gdcmElValSet::GetElValueByName(string TagName) { - if ( ! NameHt.count(TagName)) - return "gdcm::Unfound"; - return NameHt.find(TagName)->second->GetValue(); + if ( ! NameHt.count(TagName)) + return "gdcm::Unfound"; + return NameHt.find(TagName)->second->GetValue(); } - +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ int gdcmElValSet::SetElValueByNumber(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; + tagHt[key]->SetValue(content); + string vr = tagHt[key]->GetVR(); + guint32 lgr; + + if( (vr == "US") || (vr == "SS") ) + lgr = 2; + else if( (vr == "UL") || (vr == "SL") ) + lgr = 4; + else + lgr = content.length(); + tagHt[key]->SetLength(lgr); + return 1; } +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ int gdcmElValSet::SetElValueByName(string content, string TagName) { - if ( ! NameHt.count(TagName)) - return 0; - NameHt[TagName]->SetValue(content); - NameHt[TagName]->SetLength(content.length()); - return 1; + if ( ! NameHt.count(TagName)) + return 0; + NameHt[TagName]->SetValue(content); + 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,109 +227,140 @@ guint32 gdcmElValSet::GenerateFreeTagKeyInGroup(guint16 group) { return UINT32_MAX; } +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ 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; + tagHt[key]->SetLength(length); + return 1 ; } +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ int gdcmElValSet::SetElValueLengthByName(guint32 length, string TagName) { - if ( ! NameHt.count(TagName)) - return 0; - NameHt.find(TagName)->second->SetLength(length); - return 1 ; + if ( ! NameHt.count(TagName)) + return 0; + 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 + +// re-computes the length of a ACR-NEMA/Dicom group +// from a DcmHeader + +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ +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") + + gdcmElValue *elem; + char trash[10]; + 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; + // pas SEQUENCE en ACR-NEMA - // WARNING : risque de pb + // WARNING : pb CERTAIN // 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); - } - } + // + // --> la descente a l'interieur' des SQ + // devra 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(); + } + } + + if(1) // unnormalized way to see what happened + 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(); // 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 + * @return + */ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { guint16 gr, el; guint32 lgr; @@ -211,12 +368,15 @@ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { string vr; guint32 val_uint32; guint16 val_uint16; - + vector tokens; void *ptr; - for (TagElValueHT::iterator tag2 = tagHt.begin(); + // 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){ @@ -225,15 +385,13 @@ 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); if ( type == ACR ) { if (gr < 0x0008) continue; - if (gr %2) continue; + // if (gr %2) continue; // pour voir if (vr == "SQ" ) continue; } - fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp); //group fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element @@ -273,6 +431,7 @@ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { } continue; } + tokens.clear(); // Les pixels ne sont pas chargés dans l'element ! if ((gr == 0x7fe0) && (el == 0x0010) ) break; @@ -281,277 +440,42 @@ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { } } -// Sorry for the DEBUG's, but tomorow is gonna be hoter than today - -int gdcmElValSet::Write(FILE * _fp) { - - guint16 gr, el; - guint32 lgr; - const char * val; - string vr; - guint32 val_uint32; - guint16 val_uint16; - - vector tokens; - - void *ptr; - - string implicitVRTransfertSyntax = "1.2.840.10008.1.2"; - SetElValueByNumber(implicitVRTransfertSyntax, 0x0002, 0x0010); - //FIXME Refer to standards on page 21, chapter 6.2 "Value representation": - // values with a VR of UI shall be padded with a single trailing null - // Dans le cas suivant on doit pader manuellement avec un 0. - SetElValueLengthByNumber(18, 0x0002, 0x0010); - - // Question : - // Comment pourrait-on tester si on est TrueDicom ou non , +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ +int gdcmElValSet::Write(FILE * _fp, FileType type) { + + if (type == ImplicitVR) { + string implicitVRTransfertSyntax = "1.2.840.10008.1.2"; + SetElValueByNumber(implicitVRTransfertSyntax, 0x0002, 0x0010); + + //FIXME Refer to standards on page 21, chapter 6.2 "Value representation": + // values with a VR of UI shall be padded with a single trailing null + // Dans le cas suivant on doit pader manuellement avec un 0 + + SetElValueLengthByNumber(18, 0x0002, 0x0010); + } + // Question : + // Comment pourrait-on savoir si le DcmHeader vient d'un fichier DicomV3 ou non , // (FileType est un champ de gdcmHeader ...) - // - UpdateGroupLength(); - - // 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(DEBUG)printf ("%04x %04x [%s] : [%s]\n",gr, el, vr.c_str(), val); - - fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp); //group - fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element - - // si on n'est pas en IMPLICIT VR voir pb (lgr + VR) - - fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); //lgr - - tokens.erase(tokens.begin(),tokens.end()); - Tokenize (tag2->second->GetValue(), tokens, "\\"); - - if (vr == "US" || vr == "SS") { - for (unsigned int i=0; i tokens; - - void *ptr; - - //string implicitVRTransfertSyntax = "1.2.840.10008.1.2"; // supprime par rapport à Write - //CLEANME Utilisées pour le calcul Group Length - //CLEANMEguint32 lgrCalcGroupe=0; - //CLEANMEgdcmElValue *elem, *elemZ, *elemZPrec; - //CLEANMEguint16 grCourant = 0; - - // Question : - // Comment pourrait-on tester si on est TrueDicom ou non , - // (FileType est un champ de gdcmHeader ...) - // - UpdateGroupLength(true); - - // Si on fait de l'implicit VR little Endian - // (pour moins se fairche sur processeur INTEL) - // penser a forcer le TRANSFERT SYNTAX UID - - // supprime par rapport à Write - //SetElValueByNumber(implicitVRTransfertSyntax, 0x0002, 0x0010); - //SetElValueLengthByNumber(18, 0x0002, 0x0010); // Le 0 de fin de chaine doit etre stocké, dans ce cas - - // restent à tester les echecs en écriture (apres chaque fwrite) - - for (TagElValueHT::iterator tag2 = tagHt.begin(); - tag2 != tagHt.end(); - ++tag2){ - - gr = tag2->second->GetGroup(); - // saut des groupes speciaux DICOM V3 - if (gr < 0x0008) continue; // ajouté par rapport à Write - // saut des groupes impairs - if (gr %2) continue; // ajouté par rapport à Write - - el = tag2->second->GetElement(); - lgr = tag2->second->GetLength(); - val = tag2->second->GetValue().c_str(); - vr = tag2->second->GetVR(); - - fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp); //group - fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element - - // si on n'est pas en IMPLICIT VR voir pb (lgr + VR) - - fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); //lgr - - tokens.erase(tokens.begin(),tokens.end()); - Tokenize (tag2->second->GetValue(), tokens, "\\"); - - if (vr == "US" || vr == "SS") { - - for (unsigned int i=0; i tokens; - - void *ptr; + if (type == ExplicitVR) { + string explicitVRTransfertSyntax = "1.2.840.10008.1.2.1"; + SetElValueByNumber(explicitVRTransfertSyntax, 0x0002, 0x0010); + // See above comment + SetElValueLengthByNumber(20, 0x0002, 0x0010); + } - string explicitVRTransfertSyntax = "1.2.840.10008.1.2.1"; - - - // Question : - // Comment pourrait-on tester si on est TrueDicom ou non , - // (FileType est un champ de gdcmHeader ...) - // + if ( (type == ImplicitVR) || (type == ExplicitVR) ) + UpdateGroupLength(false,type); + if ( type == ACR) + UpdateGroupLength(true,ACR); - // On fait de l'Explicit VR little Endian - - - SetElValueByNumber(explicitVRTransfertSyntax, 0x0002, 0x0010); - SetElValueLengthByNumber(20, 0x0002, 0x0010); // Le 0 de fin de chaine doit etre stocké, dans ce cas // ??? - - // Question : - // Comment pourrait-on tester si on est TrueDicom ou non , - // (FileType est un champ de gdcmHeader ...) - // - UpdateGroupLength(); - - - // 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(DEBUG)printf ("%04x %04x [%s] : [%s]\n",gr, el, vr.c_str(), val); - - fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp); //group - fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element - - // On est en EXPLICIT VR - if (gr == 0x0002) { - 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