X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=5f31e20205cf00f95bce10d6e11d52bda420bb17;hb=c2975ffb8c79fa4d745368d8d1c317c5a313dd0a;hp=8c817b5a927a680b7443739258be9456089c459f;hpb=2367659aa3cf7e685b91343b24bc28d7fbbf2cbb;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 8c817b5a..5f31e202 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/01/06 16:29:22 $ - Version: $Revision: 1.31 $ + Date: $Date: 2005/11/21 09:41:46 $ + Version: $Revision: 1.68 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,245 +21,521 @@ #include "gdcmCommon.h" #include "gdcmDictSet.h" #include "gdcmGlobal.h" -#include "gdcmException.h" #include "gdcmDocEntry.h" #include "gdcmSeqEntry.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" - -#include +#include "gdcmUtil.h" +#include "gdcmDataEntry.h" +#include "gdcmVR.h" namespace gdcm { - +//----------------------------------------------------------------------------- +// Constructor / Destructor +DocEntrySet::DocEntrySet() +{ + PreviousDocEntry = 0; +} //----------------------------------------------------------------------------- // Public /** - * \brief Gets a Dicom Element inside a SQ Item Entry, by name - * @param name of the element to be found. - * @return + * \brief Get the "std::string representable" value of the Dicom entry + * @param group Group number of the searched tag. + * @param elem Element number of the searched tag. + * @return Corresponding element value when it exists, + * and the string GDCM_UNFOUND otherwise. */ -DocEntry* DocEntrySet::GetDocEntryByName( TagName const & name ) +std::string DocEntrySet::GetEntryString(uint16_t group, uint16_t elem) { - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *dictEntry = pubDict->GetDictEntryByName(name); - if( !dictEntry ) + DataEntry *entry = dynamic_cast(GetDocEntry(group,elem)); + if ( entry ) { - return 0; + if( entry->IsNotLoaded() ) + return GDCM_NOTLOADED; + if( entry->IsUnfound() ) + return GDCM_UNFOUND; + if( entry->IsUnread() ) + return GDCM_UNREAD; + return entry->GetString(); } + return GDCM_UNFOUND; +} - return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); +/** + * \brief Gets (from Header) a 'non string' element value + * @param group group number of the Entry + * @param elem element number of the Entry + * @return Pointer to the 'non string' area + */ +void *DocEntrySet::GetEntryBinArea(uint16_t group, uint16_t elem) +{ + DataEntry *entry = GetDataEntry(group, elem); + if ( entry ) + return entry->GetBinArea(); + return 0; } +/** + * \brief Searches within the DocEntrySet + * for the value length of a given tag.. + * @param group Group number of the searched tag. + * @param elem Element number of the searched tag. + * @return Corresponding element length; -1 if not found + */ +int DocEntrySet::GetEntryLength(uint16_t group, uint16_t elem) +{ + DocEntry *entry = GetDocEntry(group, elem); + if ( entry ) + return entry->GetLength(); + return -1; +} /** - * \brief Get the value of a Dicom Element inside a SQ Item Entry, by name - * @param name : name of the searched element. - * @return - */ + * \brief Same as \ref Document::GetDocEntry except it returns a result + * only when the corresponding entry is of type DataEntry. + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return When present, the corresponding DataEntry. + */ +DataEntry *DocEntrySet::GetDataEntry(uint16_t group, uint16_t elem) +{ + DocEntry *currentEntry = GetDocEntry(group, elem); + if ( !currentEntry ) + return NULL; + + return dynamic_cast(currentEntry); +} -std::string DocEntrySet::GetEntryByName(TagName const & name) +/** + * \brief Same as \ref Document::GetDocEntry except it returns a result + * only when the corresponding entry is of type SeqEntry. + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return When present, the corresponding SeqEntry. + */ +SeqEntry *DocEntrySet::GetSeqEntry(uint16_t group, uint16_t elem) { - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *dictEntry = pubDict->GetDictEntryByName(name); + DocEntry *currentEntry = GetDocEntry(group, elem); + if ( !currentEntry ) + return NULL; + + return dynamic_cast(currentEntry); +} - if( !dictEntry ) +/** + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) + * through it's (group, element) and modifies it's content with + * the given value. + * @param content new value (string) to substitute with + * @param group group number of the Dicom Element to modify + * @param elem element number of the Dicom Element to modify + */ +bool DocEntrySet::SetEntryString(std::string const &content, + uint16_t group, uint16_t elem) +{ + DataEntry *entry = GetDataEntry(group, elem); + if (!entry ) { - return GDCM_UNFOUND; + gdcmWarningMacro( "No corresponding DataEntry " << std::hex << group << + "," << elem << " element (try promotion first)."); + return false; } - - return GetEntryByNumber(dictEntry->GetGroup(), dictEntry->GetElement()); + return SetEntryString(content,entry); } /** - * \brief Request a new virtual dict entry to the dict set - * @param group group number of the underlying DictEntry - * @param elem element number of the underlying DictEntry - * @param vr VR of the underlying DictEntry - * @param fourth owner group - * @param name english name + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) + * through it's (group, element) and modifies it's content with + * the given value. + * @param content new value (void* -> uint8_t*) to substitute with + * @param lgth new value length + * @param group group number of the Dicom Element to modify + * @param elem element number of the Dicom Element to modify + */ +bool DocEntrySet::SetEntryBinArea(uint8_t *content, int lgth, + uint16_t group, uint16_t elem) +{ + DataEntry *entry = GetDataEntry(group, elem); + if (!entry ) + { + gdcmWarningMacro( "No corresponding DataEntry " << std::hex << group << + "," << elem << " element (try promotion first)."); + return false; + } + + return SetEntryBinArea(content,lgth,entry); +} + +/** + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) + * and modifies it's content with the given value. + * @param content new value (string) to substitute with + * @param entry Entry to be modified */ -DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem, - TagName const & vr, - TagName const & fourth, - TagName const & name ) +bool DocEntrySet::SetEntryString(std::string const &content, DataEntry *entry) { - return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,fourth,name); + if (entry) + { + entry->SetString(content); + return true; + } + return false; } -//----------------------------------------------------------------------------- -// Protected /** - * \brief Build a new Val Entry from all the low level arguments. - * Check for existence of dictionary entry, and build - * a default one when absent. - * @param group group number of the new Entry - * @param elem element number of the new Entry - * @param vr VR of the new Entry + * \brief Accesses an existing DataEntry (i.e. a Dicom Element) + * and modifies it's content with the given value. + * @param content new value (void* -> uint8_t*) to substitute with + * @param entry Entry to be modified + * @param lgth new value length */ -ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group,uint16_t elem, - TagName const & vr) +bool DocEntrySet::SetEntryBinArea(uint8_t *content, int lgth, DataEntry *entry) { - DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); - assert(dictEntry); + if (entry) + { + entry->SetLength(lgth); + entry->SetBinArea(content); + return true; + } + return false; +} - ValEntry *newEntry = new ValEntry(dictEntry); - if (!newEntry) +/** + * \brief Modifies the value of a given Doc Entry (Dicom Element) + * when it exists. Create 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 + * @param vr V(alue) R(epresentation) of the Entry -if private Entry- + * \return pointer to the modified/created Header Entry (NULL when creation + * failed). + */ +DataEntry *DocEntrySet::InsertEntryString(std::string const &value, + uint16_t group, uint16_t elem, + VRKey const &vr ) +{ + DataEntry *dataEntry = 0; + DocEntry *currentEntry = GetDocEntry( group, elem ); + + if (currentEntry) { - dbg.Verbose(1, "Document::NewValEntryByNumber", - "failed to allocate ValEntry"); - return 0; + dataEntry = dynamic_cast(currentEntry); + + // Verify the VR + if ( dataEntry ) + if ( dataEntry->GetVR()!=vr ) + dataEntry = NULL; + + // if currentEntry doesn't correspond to the requested dataEntry + if ( !dataEntry) + { + if ( !RemoveEntry(currentEntry) ) + { + gdcmWarningMacro( "Removal of previous DocEntry failed."); + return NULL; + } + } } - return newEntry; + + // Create a new dataEntry if necessary + if ( !dataEntry ) + { + dataEntry = NewDataEntry( group, elem, vr ); + + if ( !AddEntry(dataEntry) ) + { + gdcmWarningMacro("AddEntry failed although this is a creation."); + dataEntry->Delete(); + return NULL; + } + dataEntry->Delete(); + } + + // Set the dataEntry value + SetEntryString(value, dataEntry); // The std::string value + return dataEntry; } +/** + * \brief Modifies the value of a given Header Entry (Dicom Element) + * when it exists. Create it with the given value when unexistant. + * A copy of the binArea is made to be kept in the Document. + * @param binArea (binary) value to be set + * @param lgth length of the Bin Area we want to set + * @param group Group number of the Entry + * @param elem Element number of the Entry + * @param vr V(alue) R(epresentation) of the Entry -if private Entry- + * \return pointer to the modified/created Header Entry (NULL when creation + * failed). + */ +DataEntry *DocEntrySet::InsertEntryBinArea(uint8_t *binArea, int lgth, + uint16_t group, uint16_t elem, + VRKey const &vr ) +{ + DataEntry *dataEntry = 0; + DocEntry *currentEntry = GetDocEntry( group, elem ); + + // Verify the currentEntry + if (currentEntry) + { + dataEntry = dynamic_cast(currentEntry); + + // Verify the VR + if ( dataEntry ) + if ( dataEntry->GetVR()!=vr ) + dataEntry = NULL; + + // if currentEntry doesn't correspond to the requested dataEntry + if ( !dataEntry) + { + if ( !RemoveEntry(currentEntry) ) + { + gdcmWarningMacro( "Removal of previous DocEntry failed."); + return NULL; + } + } + } + + // Create a new dataEntry if necessary + if ( !dataEntry) + { + dataEntry = NewDataEntry(group, elem, vr); + + if ( !AddEntry(dataEntry) ) + { + gdcmWarningMacro( "AddEntry failed although this is a creation."); + dataEntry->Delete(); + return NULL; + } + dataEntry->Delete(); + } + + // Set the dataEntry value + uint8_t *tmpArea; + if ( lgth>0 && binArea ) + { + tmpArea = new uint8_t[lgth]; + memcpy(tmpArea,binArea,lgth); + } + else + { + tmpArea = 0; + } + if ( !SetEntryBinArea(tmpArea,lgth,dataEntry) ) + { + if ( tmpArea ) + { + delete[] tmpArea; + } + } + return dataEntry; +} /** - * \brief Build a new Bin Entry from all the low level arguments. - * Check for existence of dictionary entry, and build - * a default one when absent. - * @param group group number of the new Entry - * @param elem element number of the new Entry - * @param vr VR of the new Entry + * \brief Creates a new gdcm::SeqEntry and adds it to the current DocEntrySet. + * (remove any existing entry with same group,elem) + * @param group Group number of the Entry + * @param elem Element number of the Entry + * \return pointer to the created SeqEntry (NULL when creation + * failed). */ -BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,uint16_t elem, - TagName const & vr) +SeqEntry *DocEntrySet::InsertSeqEntry(uint16_t group, uint16_t elem) { - DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); - assert(dictEntry); + SeqEntry *seqEntry = 0; + DocEntry *currentEntry = GetDocEntry( group, elem ); - BinEntry *newEntry = new BinEntry(dictEntry); - if (!newEntry) + // Verify the currentEntry + if ( currentEntry ) { - dbg.Verbose(1, "Document::NewBinEntryByNumber", - "failed to allocate BinEntry"); - return 0; + seqEntry = dynamic_cast(currentEntry); + + // Verify the VR + if ( seqEntry ) + seqEntry = NULL; + + // if currentEntry doesn't correspond to the requested seqEntry + if ( !seqEntry ) + { + if (!RemoveEntry(currentEntry)) + { + gdcmWarningMacro( "Removal of previous DocEntry failed for (" + <Delete(); + return NULL; + } + seqEntry->Delete(); + } + // Remark : + // SequenceDelimitationItem will be added at the end of the SeqEntry, + // at write time + return seqEntry; +} + +/** + * \brief Checks if a given Dicom Element exists within the DocEntrySet + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return true is found + */ +bool DocEntrySet::CheckIfEntryExist(uint16_t group, uint16_t elem ) +{ + return GetDocEntry(group,elem)!=NULL; } /** - * \brief Build a new Seq Entry from all the low level arguments. + * \brief Build a new DataEntry from all the low level arguments. * Check for existence of dictionary entry, and build * a default one when absent. - * @param group group number of the new Entry - * @param elem element number of the new Entry + * @param group Group number of the new Entry + * @param elem Element number of the new Entry + * @param vr V(alue) R(epresentation) of the new Entry + * \remarks The user of this method must destroy the DataEntry when unused */ -SeqEntry* DocEntrySet::NewSeqEntryByNumber(uint16_t group,uint16_t elem) +DataEntry *DocEntrySet::NewDataEntry(uint16_t group,uint16_t elem, + VRKey const &vr) { - DictEntry *dictEntry = GetDictEntryByNumber(group, elem, "SQ"); - assert(dictEntry); + DictEntry *dictEntry = GetDictEntry(group, elem, vr); - SeqEntry *newEntry = new SeqEntry( dictEntry ); - if (!newEntry) + DataEntry *newEntry = DataEntry::New(dictEntry); + dictEntry->Unregister(); // GetDictEntry register it + if (!newEntry) { - dbg.Verbose(1, "Document::NewSeqEntryByNumber", - "failed to allocate SeqEntry"); + gdcmWarningMacro( "Failed to allocate DataEntry for (" + <Unregister(); // GetDictEntry register it + if (!newEntry) { - dbg.Verbose(1, "SQItem::NewDocEntryByNumber", - "failed to allocate DocEntry"); + gdcmWarningMacro( "Failed to allocate SeqEntry for (" + <GetDefaultPubDict(); if (!pubDict) { - dbg.Verbose(0, "Document::GetDictEntry", - "we SHOULD have a default dictionary"); + gdcmWarningMacro( "We SHOULD have a default dictionary"); } else { - found = pubDict->GetDictEntryByName(name); + found = pubDict->GetEntry(group, elem); + if( found ) + found->Register(); } 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. The public dictionary has precedence on the - * shadow one. - * @param group group number of the searched DictEntry + * \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::GetDictEntryByNumber(uint16_t group,uint16_t elem) +DictEntry *DocEntrySet::GetDictEntry(uint16_t group, uint16_t elem, + VRKey const &vr) { - DictEntry *found = 0; - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - if (!pubDict) + DictEntry *dictEntry = GetDictEntry(group,elem); + DictEntry *goodEntry = dictEntry; + VRKey goodVR = vr; + TagName vm; + if (elem == 0x0000) + goodVR="UL"; + + if ( goodEntry ) { - dbg.Verbose(0, "Document::GetDictEntry", - "we SHOULD have a default dictionary"); + 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 { - found = pubDict->GetDictEntryByNumber(group, elem); + vm = "FIXME"; } - return found; -} - -DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group, uint16_t elem, - TagName const & vr) -{ - DictEntry *dictEntry = GetDictEntryByNumber(group,elem); - DictEntry *goodEntry = dictEntry; - std::string goodVR=vr; - - if (elem==0x0000) - goodVR="UL"; - - if (goodEntry) - if (goodEntry->GetVR() != goodVR && goodVR!=GDCM_UNKNOWN) - goodEntry=NULL; - // Create a new virtual DictEntry if necessary if (!goodEntry) { if (dictEntry) - goodEntry = NewVirtualDictEntry(group, elem, goodVR,"FIXME",dictEntry->GetName()); + { + + goodEntry = DictEntry::New(group, elem, goodVR, vm,//"FIXME", + dictEntry->GetName() ); + } else - goodEntry = NewVirtualDictEntry(group, elem, goodVR); + { + goodEntry = DictEntry::New(group, elem, goodVR); + } + } + else + { + goodEntry->Register(); } - return goodEntry; } //----------------------------------------------------------------------------- // Private -} // end namespace gdcm +//----------------------------------------------------------------------------- +// Print //----------------------------------------------------------------------------- +} // end namespace gdcm