X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=05a552492a513c6c098c20d81ba7a173b530bb1f;hb=4b19bf900463affaf44f2a0f3b4db6ec575bc7b2;hp=5f31e20205cf00f95bce10d6e11d52bda420bb17;hpb=ac07c623eaeff39070d0cc4cb05f9dd2c04ca931;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 5f31e202..05a55249 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2005/11/21 09:41:46 $ - Version: $Revision: 1.68 $ + Date: $Date: 2006/04/11 16:03:26 $ + Version: $Revision: 1.72 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,6 +27,10 @@ #include "gdcmDataEntry.h" #include "gdcmVR.h" +#if defined(__BORLANDC__) + #include // for memset +#endif + namespace gdcm { //----------------------------------------------------------------------------- @@ -117,7 +121,7 @@ SeqEntry *DocEntrySet::GetSeqEntry(uint16_t group, uint16_t elem) DocEntry *currentEntry = GetDocEntry(group, elem); if ( !currentEntry ) return NULL; - + return dynamic_cast(currentEntry); } @@ -201,7 +205,7 @@ bool DocEntrySet::SetEntryBinArea(uint8_t *content, int lgth, DataEntry *entry) /** * \brief Modifies the value of a given Doc Entry (Dicom Element) - * when it exists. Create it with the given value when unexistant. + * when it exists. Creates it with the given value when unexistant. * @param value (string) Value to be set * @param group Group number of the Entry * @param elem Element number of the Entry @@ -210,12 +214,12 @@ bool DocEntrySet::SetEntryBinArea(uint8_t *content, int lgth, DataEntry *entry) * failed). */ DataEntry *DocEntrySet::InsertEntryString(std::string const &value, - uint16_t group, uint16_t elem, - VRKey const &vr ) + uint16_t group, uint16_t elem, + VRKey const &vr ) { DataEntry *dataEntry = 0; DocEntry *currentEntry = GetDocEntry( group, elem ); - + VRKey localVR = vr; if (currentEntry) { dataEntry = dynamic_cast(currentEntry); @@ -235,19 +239,35 @@ DataEntry *DocEntrySet::InsertEntryString(std::string const &value, } } } + + else // the 'currentEntry' was not found + { + if ( vr == GDCM_VRUNKNOWN ) // user didn't specify a VR. + // Probabely he trusts the Dicom Dict ! + { + DictEntry *e = + Global::GetDicts()->GetDefaultPubDict()->GetEntry(group, elem); + if ( e ) + { + localVR = e->GetVR(); + e->Register(); // ?? JPRx + } + } + } // Create a new dataEntry if necessary if ( !dataEntry ) { - dataEntry = NewDataEntry( group, elem, vr ); + dataEntry = NewDataEntry( group, elem, localVR ); if ( !AddEntry(dataEntry) ) { - gdcmWarningMacro("AddEntry failed although this is a creation."); + gdcmWarningMacro("AddEntry " << dataEntry->GetKey() + << " failed although this is a creation."); dataEntry->Delete(); return NULL; } - dataEntry->Delete(); + dataEntry->Delete(); // ?!? JPRx } // Set the dataEntry value @@ -268,8 +288,8 @@ DataEntry *DocEntrySet::InsertEntryString(std::string const &value, * failed). */ DataEntry *DocEntrySet::InsertEntryBinArea(uint8_t *binArea, int lgth, - uint16_t group, uint16_t elem, - VRKey const &vr ) + uint16_t group, uint16_t elem, + VRKey const &vr ) { DataEntry *dataEntry = 0; DocEntry *currentEntry = GetDocEntry( group, elem ); @@ -394,6 +414,7 @@ bool DocEntrySet::CheckIfEntryExist(uint16_t group, uint16_t elem ) return GetDocEntry(group,elem)!=NULL; } + /** * \brief Build a new DataEntry from all the low level arguments. * Check for existence of dictionary entry, and build @@ -406,10 +427,8 @@ bool DocEntrySet::CheckIfEntryExist(uint16_t group, uint16_t elem ) DataEntry *DocEntrySet::NewDataEntry(uint16_t group,uint16_t elem, VRKey const &vr) { - DictEntry *dictEntry = GetDictEntry(group, elem, vr); - DataEntry *newEntry = DataEntry::New(dictEntry); - dictEntry->Unregister(); // GetDictEntry register it + DataEntry *newEntry = DataEntry::New(group,elem,vr); if (!newEntry) { gdcmWarningMacro( "Failed to allocate DataEntry for (" @@ -429,16 +448,17 @@ DataEntry *DocEntrySet::NewDataEntry(uint16_t group,uint16_t elem, */ SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group, uint16_t elem) { - DictEntry *dictEntry = GetDictEntry(group, elem, "SQ"); + //DictEntry *dictEntry = GetDictEntry(group, elem, "SQ"); - SeqEntry *newEntry = SeqEntry::New( dictEntry ); - dictEntry->Unregister(); // GetDictEntry register it + //SeqEntry *newEntry = SeqEntry::New( dictEntry ); + SeqEntry *newEntry = SeqEntry::New( group,elem ); + //dictEntry->Unregister(); // GetDictEntry register it if (!newEntry) { gdcmWarningMacro( "Failed to allocate SeqEntry for (" < Done! Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); if (!pubDict) { @@ -471,66 +493,6 @@ DictEntry *DocEntrySet::GetDictEntry(uint16_t group,uint16_t elem) return found; } -/** - * \brief Searches [both] the public [and the shadow dictionary (when they - * exist)] for the presence of the DictEntry with given - * group and element, and create a new virtual DictEntry if necessary - * @param group group number of the searched DictEntry - * @param elem element number of the searched DictEntry - * @param vr V(alue) R(epresentation) to use, if necessary - * @return Corresponding DictEntry when it exists, NULL otherwise. - * \remarks The returned DictEntry is registered - */ -DictEntry *DocEntrySet::GetDictEntry(uint16_t group, uint16_t elem, - VRKey const &vr) -{ - DictEntry *dictEntry = GetDictEntry(group,elem); - DictEntry *goodEntry = dictEntry; - VRKey goodVR = vr; - TagName vm; - if (elem == 0x0000) - goodVR="UL"; - - if ( goodEntry ) - { - if ( goodVR != goodEntry->GetVR() - && goodVR != GDCM_VRUNKNOWN ) - { - gdcmWarningMacro("For (" << std::hex << group << "|" - << elem << "), found VR : [" << vr << "]" - << " expected: [" << goodEntry->GetVR() << "]" ) ; - // avoid confusing further validator with "FIXME" VM - // when possible - vm = dictEntry->GetVM(); - goodEntry = NULL; - } - dictEntry->Unregister(); - } - else - { - vm = "FIXME"; - } - // Create a new virtual DictEntry if necessary - if (!goodEntry) - { - if (dictEntry) - { - - goodEntry = DictEntry::New(group, elem, goodVR, vm,//"FIXME", - dictEntry->GetName() ); - } - else - { - goodEntry = DictEntry::New(group, elem, goodVR); - } - } - else - { - goodEntry->Register(); - } - return goodEntry; -} - //----------------------------------------------------------------------------- // Private