X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocEntrySet.cxx;h=25673de869c13c73e14c5dd66acb856658c84f93;hb=03acf3c119c6657129b8aeae8cb2205e481a105b;hp=9e722cf0dce4c640cf7e1b73c6003cee577221c0;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 9e722cf0..25673de8 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2004/10/12 04:35:45 $ - Version: $Revision: 1.24 $ + Date: $Date: 2005/01/06 17:20:53 $ + Version: $Revision: 1.32 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,6 +19,7 @@ #include "gdcmDebug.h" #include "gdcmCommon.h" +#include "gdcmDictSet.h" #include "gdcmGlobal.h" #include "gdcmException.h" #include "gdcmDocEntry.h" @@ -26,103 +27,20 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" +#include + namespace gdcm { //----------------------------------------------------------------------------- // Public - -/** - * \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 underlying DictEntry - * @param elem element number of the underlying DictEntry - */ -ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group, - uint16_t elem) -{ - // Find out if the tag we encountered is in the dictionaries: - DictEntry *dictEntry = GetDictEntryByNumber(group, elem); - if (!dictEntry) - { - dictEntry = NewVirtualDictEntry(group, elem); - } - - ValEntry *newEntry = new ValEntry(dictEntry); - if (!newEntry) - { - dbg.Verbose(1, "Document::NewValEntryByNumber", - "failed to allocate ValEntry"); - return 0; - } - return newEntry; -} - - -/** - * \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 underlying DictEntry - * @param elem element number of the underlying DictEntry - */ -BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group, - uint16_t elem) -{ - // Find out if the tag we encountered is in the dictionaries: - DictEntry *dictEntry = GetDictEntryByNumber(group, elem); - if (!dictEntry) - { - dictEntry = NewVirtualDictEntry(group, elem); - } - - BinEntry *newEntry = new BinEntry(dictEntry); - if (!newEntry) - { - dbg.Verbose(1, "Document::NewBinEntryByNumber", - "failed to allocate BinEntry"); - return 0; - } - return newEntry; -} - -/** - * \brief Build a new Seq 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 underlying DictEntry - * @param Elem element number of the underlying DictEntry - */ -SeqEntry* DocEntrySet::NewSeqEntryByNumber(uint16_t Group, - uint16_t Elem) -{ - // Find out if the tag we encountered is in the dictionaries: - DictEntry* DictEntry = GetDictEntryByNumber( Group, Elem ); - if ( ! DictEntry ) - { - DictEntry = NewVirtualDictEntry(Group, Elem); - } - - SeqEntry *NewEntry = new SeqEntry( DictEntry ); - if ( !NewEntry ) - { - dbg.Verbose(1, "Document::NewSeqEntryByNumber", - "failed to allocate SeqEntry"); - return 0; - } - return NewEntry; -} - -//----------------------------------------------------------------------------- -// Protected - /** - * \brief Gets a Dicom Element inside a SQ Item Entry, by name + * \brief Gets a Dicom Element inside a SQ Item Entry, by name + * @param name of the element to be found. * @return */ - DocEntry *DocEntrySet::GetDocEntryByName(std::string const & name) - { +DocEntry* DocEntrySet::GetDocEntryByName( TagName const & name ) +{ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); DictEntry *dictEntry = pubDict->GetDictEntryByName(name); if( !dictEntry ) @@ -153,104 +71,95 @@ std::string DocEntrySet::GetEntryByName(TagName const & name) return GetEntryByNumber(dictEntry->GetGroup(), dictEntry->GetElement()); } - /** * \brief Request a new virtual dict entry to the dict set * @param group group number of the underlying DictEntry - * @param element element 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 */ -DictEntry* DocEntrySet::NewVirtualDictEntry(uint16_t group, - uint16_t element, - std::string const & vr, - std::string const & fourth, - std::string const & name) +DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem, + TagName const & vr, + TagName const & fourth, + TagName const & name ) { - return Global::GetDicts()->NewVirtualDictEntry(group,element,vr,fourth,name); + return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,fourth,name); } -/** \brief - * Creates a new DocEntry (without any 'value' ...) - * @param group group number of the underlying DictEntry - * @param elem elem number of the underlying DictEntry +//----------------------------------------------------------------------------- +// 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 */ -DocEntry* DocEntrySet::NewDocEntryByNumber(uint16_t group, - uint16_t elem) +ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group,uint16_t elem, + TagName const & vr) { - // Find out if the tag we encountered is in the dictionaries: - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); - if (!dictEntry) - { - dictEntry = NewVirtualDictEntry(group, elem); - } + DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); + assert(dictEntry); - DocEntry *newEntry = new DocEntry(dictEntry); + ValEntry *newEntry = new ValEntry(dictEntry); if (!newEntry) { - dbg.Verbose(1, "SQItem::NewDocEntryByNumber", - "failed to allocate DocEntry"); + dbg.Verbose(1, "Document::NewValEntryByNumber", + "failed to allocate ValEntry"); return 0; } return newEntry; } -/** \brief - * Creates a new DocEntry (without any 'value' ...) - * @param group group number of the underlying DictEntry - * @param elem elem number of the underlying DictEntry - * @param VR V(alue) R(epresentation) of the Entry -if private Entry- - +/** + * \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 */ -DocEntry* DocEntrySet::NewDocEntryByNumber(uint16_t group, - uint16_t elem, - std::string const &VR) +BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,uint16_t elem, + TagName const & vr) { - // Find out if the tag we encountered is in the dictionaries: - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); - if (!dictEntry) - { - dictEntry = NewVirtualDictEntry(group, elem, VR); - } + DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); + assert(dictEntry); - DocEntry *newEntry = new DocEntry(dictEntry); + BinEntry *newEntry = new BinEntry(dictEntry); if (!newEntry) { - dbg.Verbose(1, "SQItem::NewDocEntryByNumber", - "failed to allocate DocEntry"); + dbg.Verbose(1, "Document::NewBinEntryByNumber", + "failed to allocate BinEntry"); return 0; } return newEntry; } -/* \brief - * Probabely move, as is, to DocEntrySet, as a non virtual method - * an remove Document::NewDocEntryByName + +/** + * \brief Build a new Seq 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 */ -DocEntry *DocEntrySet::NewDocEntryByName (std::string const & name) +SeqEntry* DocEntrySet::NewSeqEntryByNumber(uint16_t group,uint16_t elem) { - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *newTag = pubDict->GetDictEntryByName(name); - if (!newTag) - { - newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", name); - } + DictEntry *dictEntry = GetDictEntryByNumber(group, elem, "SQ"); + assert(dictEntry); - DocEntry* newEntry = new DocEntry(newTag); - if (!newEntry) + SeqEntry *newEntry = new SeqEntry( dictEntry ); + if (!newEntry) { - dbg.Verbose(1, "SQItem::ObtainDocEntryByName", - "failed to allocate DocEntry"); + dbg.Verbose(1, "Document::NewSeqEntryByNumber", + "failed to allocate SeqEntry"); return 0; } - return newEntry; } - /** * \brief Searches both the public and the shadow dictionary (when they * exist) for the presence of the DictEntry with given name. @@ -258,7 +167,7 @@ DocEntry *DocEntrySet::NewDocEntryByName (std::string const & name) * @param name Name of the searched DictEntry * @return Corresponding DictEntry when it exists, NULL otherwise. */ -DictEntry *DocEntrySet::GetDictEntryByName(std::string const & name) +DictEntry *DocEntrySet::GetDictEntryByName(TagName const & name) { DictEntry *found = 0; Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); @@ -280,11 +189,10 @@ DictEntry *DocEntrySet::GetDictEntryByName(std::string const & name) * group and element. The public dictionary has precedence on the * shadow one. * @param group group number of the searched DictEntry - * @param element element number of the searched DictEntry + * @param elem element number of the searched DictEntry * @return Corresponding DictEntry when it exists, NULL otherwise. */ -DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group, - uint16_t element) +DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group,uint16_t elem) { DictEntry *found = 0; Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); @@ -295,11 +203,36 @@ DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group, } else { - found = pubDict->GetDictEntryByNumber(group, element); + found = pubDict->GetDictEntryByNumber(group, elem); } 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()); + else + goodEntry = NewVirtualDictEntry(group, elem, goodVR); + } + + return goodEntry; +} //----------------------------------------------------------------------------- // Private