X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElValSet.cxx;h=db65110c41e5fc6839227524b0794e84d7248394;hb=da626417557034a6838c613ed1ccb1acc6864e9a;hp=cfdae3cfe9b9fb5b4a29fc59fa79ba7e0955cd46;hpb=25efc388a88895fc1ba2b961d5f27488ab3c073c;p=gdcm.git diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx index cfdae3cf..db65110c 100644 --- a/src/gdcmElValSet.cxx +++ b/src/gdcmElValSet.cxx @@ -1,472 +1,481 @@ // gdcmElValSet.cxx +#include #include "gdcmUtil.h" #include "gdcmElValSet.h" +#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(); +} - -#include -static void Tokenize (const string& str, vector& tokens, const string& delimiters = " "); - - -TagElValueHT & ElValSet::GetTagHt(void) { +TagElValueHT & gdcmElValSet::GetTagHt(void) { return tagHt; } -void ElValSet::Add(ElValue * newElValue) { +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ +void gdcmElValSet::Add(gdcmElValue * newElValue) { tagHt [newElValue->GetKey()] = newElValue; NameHt[newElValue->GetName()] = newElValue; } -void ElValSet::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; - } + +/** + * \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 ElValSet::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; + } } -ElValue* ElValSet::GetElementByNumber(guint32 group, guint32 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 tagHt.find(key)->second; +/** + * \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; } -ElValue* ElValSet::GetElementByName(string TagName) { +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ +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) { - 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(); +/** + * \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(); } -string ElValSet::GetElValueByName(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(); +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ +string gdcmElValSet::GetElValueByName(string TagName) { + if ( ! NameHt.count(TagName)) + return "gdcm::Unfound"; + return NameHt.find(TagName)->second->GetValue(); } -int ElValSet::SetElValueByNumber(string content, guint32 group, guint32 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); - - // Question : m à j LgrElem ? - tagHt[key]->SetLength(strlen(content.c_str())); - - // FIXME should we really update the element length ? - tagHt[key]->SetLength(content.length()); - - return(1); +/** + * \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); + 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; } -int ElValSet::SetElValueByName(string content, string TagName) { - if ( ! NameHt.count(TagName)) - return 0; - if (NameHt.count(TagName) > 1) { - dbg.Verbose(0, "ElValSet::SetElValueByName", - "multipe entries for this key (FIXME) !"); - return 0; - } - NameHt.find(TagName)->second->SetValue(content); - NameHt.find(TagName)->second->SetLength(strlen(content.c_str())); - return(1); +/** + * \ingroup gdcmElValSet + * \brief + * @param + * @return + */ +int gdcmElValSet::SetElValueByName(string content, string TagName) { + 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; } - -int ElValSet::SetElValueLengthByNumber(guint32 l, guint32 group, guint32 element) { - TagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! tagHt.count(key)) - return 0; - if (tagHt.count(key) > 1) { - dbg.Verbose(0, "ElValSet::SetElValueLengthByNumber", - "multiple entries for this key (FIXME) !"); - return (0); - } - // m à j LgrElem - tagHt[key]->SetLength(l); - return(1); +/** + * \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 ElValSet::SetElValueLengthByName(guint32 l, string TagName) { - if ( ! NameHt.count(TagName)) - return 0; - if (NameHt.count(TagName) > 1) { - dbg.Verbose(0, "ElValSet::SetElValueByName", - "multipe entries for this key (FIXME) !"); - return 0; - } - NameHt.find(TagName)->second->SetLength(l); - return(1); +/** + * \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 ; } -int ElValSet::Write(FILE * _fp) { - -// ATTENTION : fonction non terminée (commitée a titre de precaution) - - guint16 gr, el; - guint32 lgr; - const char * val; - string vr; - guint32 val_uint32; - gint32 val_int32; - guint16 val_uint16; - gint16 val_int16; - - vector tokens; - - void *ptr; - char str_lgrCalcGroupe[10]; - - string implicitVRTransfertSyntax = "1.2.840.10008.1.2"; - - // Utilisées pour le calcul Group Length - int deja = 0; - guint32 lgrCalcGroupe=0; - ElValue *elem, *elemZ, *elemZPrec; - guint16 grCourant = 0; - - // Question : - // Comment pourrait-on tester si on est TrueDicom ou non , - // (FileType est un champ de gdcmHeader ...) - // - - // 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 - - if (0) // Risque de pb dans le calcul des lgr de chaque groupe. On le saute pour le moment! - - for (TagElValueHT::iterator tag = tagHt.begin(); - tag != tagHt.end(); - ++tag){ - - elem = tag->second; - printf("gr %04x el %04x lgr %d\n",elem->GetGroup(), elem->GetElement(), elem->GetLength()); - - if ( (elem->GetGroup() != grCourant) && - (elem->GetGroup() != 0xfffe) ) { // On arrive sur un nv Groupe - - printf("Nouv Groupegr %04x el %04x \n",elem->GetGroup(), elem->GetElement()); - - elemZ = elem; - - if(elemZ->GetElement() != 0x0000) { // pas d'element 'Lgr groupe' - // On crée - gdcmDictEntry * tagZ = new gdcmDictEntry(grCourant, 0x0000, "UL"); - elemZ = new ElValue(tagZ); // on le cree - elemZ->SetLength(4); - Add(elemZ); // On l'accroche à sa place - } - - if (deja) { - //sprintf(str_lgrCalcGroupe,"%d",lgrCalcGroupe); - elemZPrec->SetValue(str_lgrCalcGroupe); - lgrCalcGroupe = 0; - } - deja = 1; - - lgrCalcGroupe = 12; //2 + 2 + 4 + 4; // Gr + Num + Lgr + LgrGroupe - printf ("lgrCalcGroupe %d\n",lgrCalcGroupe); - - elemZPrec = elemZ; - grCourant = elem->GetGroup(); - - } else { // On n'EST PAS sur un nv Groupe - - printf ("lgrCalcGroupe avant : %d LgrElem %d\n",lgrCalcGroupe,elem->GetLength()); - - lgrCalcGroupe += 2 + 2 + 4 + elem->GetLength(); // Gr + Num + Lgr + LgrElem - - printf ("lgrCalcGroupe apres %d\n",lgrCalcGroupe); - } - } - - // Si on fait de l'implicit VR little Endian - // (pour moins se fairche sur processeur INTEL) - // penser a forcer le TRANSFERT SYNTAX UID - - 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(); - 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 - - //fwrite ( vr,(size_t)2 ,(size_t)1 ,_fp); //VR - - // 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, "\\"); - - //printf ("%04x %04x [%s] : [%s]\n",gr, el, vr.c_str(), val); - //if (tokens.size() > 1) { printf ("size : %d\n",tokens.size());} - - - if (vr == "US" || vr == "SS") { - /* - val_int16 = atoi(val); - ptr = &val_int16; - fwrite ( ptr,(size_t)2 ,(size_t)1 ,_fp); - continue; - */ - - for (unsigned int i=0; isecond->SetLength(length); + return 1 ; } +// 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; + + 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 : 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) { // 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; + 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; // 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 + + 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 tokens; - - void *ptr; - char str_lgrCalcGroupe[10]; - - //string implicitVRTransfertSyntax = "1.2.840.10008.1.2"; // supprime par rapport à Write - - // Utilisées pour le calcul Group Length - int deja = 0; - guint32 lgrCalcGroupe=0; - ElValue *elem, *elemZ, *elemZPrec; - guint16 grCourant = 0; - - // 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 ...) - // - - // 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 - - if (1) // Risque de pb dans le calcul des lgr de chaque groupe. On le saute pour le moment! - - for (TagElValueHT::iterator tag = tagHt.begin(); - tag != tagHt.end(); - ++tag){ - - elem = tag->second; - //printf("gr %04x el %04x lgr %d\n",elem->GetGroup(), elem->GetElement(), elem->GetLength()); - - if ( (elem->GetGroup() != grCourant) && - (elem->GetGroup() != 0xfffe) ) { // On arrive sur un nv Groupe - - //printf("Nouv Groupegr %04x el %04x \n",elem->GetGroup(), elem->GetElement()); - - elemZ = elem; - - if(elemZ->GetElement() != 0x0000) { // pas d'element 'Lgr groupe' - // On crée - gdcmDictEntry * tagZ = new gdcmDictEntry(grCourant, 0x0000, "UL"); - elemZ = new ElValue(tagZ); // on le cree - elemZ->SetLength(4); - Add(elemZ); // On l'accroche à sa place - } - - if (deja) { - //sprintf(str_lgrCalcGroupe,"%d",lgrCalcGroupe); - elemZPrec->SetValue(str_lgrCalcGroupe); - lgrCalcGroupe = 0; - } - deja = 1; - - lgrCalcGroupe = 12; //2 + 2 + 4 + 4; // Gr + Num + Lgr + LgrGroupe - //printf ("lgrCalcGroupe %d\n",lgrCalcGroupe); - - elemZPrec = elemZ; - grCourant = elem->GetGroup(); - - } else { // On n'EST PAS sur un nv Groupe - - //printf ("lgrCalcGroupe avant : %d LgrElem %d\n",lgrCalcGroupe,elem->GetLength()); - - lgrCalcGroupe += 2 + 2 + 4 + elem->GetLength(); // Gr + Num + Lgr + LgrElem - - //printf ("lgrCalcGroupe apres %d\n",lgrCalcGroupe); - } - } - - // 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) + // WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA + // no way - 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, const string& delimiters = " ") { - string::size_type lastPos = str.find_first_not_of(delimiters,0); - string::size_type pos = str.find_first_of(delimiters,lastPos); - while (string::npos != pos || string::npos != lastPos) { - tokens.push_back(str.substr(lastPos, pos - lastPos)); - lastPos = str.find_first_not_of(delimiters, pos); - pos = str.find_first_of(delimiters, lastPos); - } + if (type == ExplicitVR) { + string explicitVRTransfertSyntax = "1.2.840.10008.1.2.1"; + SetElValueByNumber(explicitVRTransfertSyntax, 0x0002, 0x0010); + // See above comment + SetElValueLengthByNumber(20, 0x0002, 0x0010); + } + + if ( (type == ImplicitVR) || (type == ExplicitVR) ) + UpdateGroupLength(false,type); + if ( type == ACR) + UpdateGroupLength(true,ACR); + + WriteElements(type, _fp); + return(1); }