X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=14dea485877a3be263f870a12bb5eefa28490225;hb=31c63a6cb25b49a119e0132201c051ade2e17704;hp=25673de869c13c73e14c5dd66acb856658c84f93;hpb=a9bcaad80ee1a1af655405a22aca5987df9045ba;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 25673de8..14dea485 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 17:20:53 $ - Version: $Revision: 1.32 $ + Date: $Date: 2005/01/08 15:03:59 $ + Version: $Revision: 1.41 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,64 +27,27 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" -#include - namespace gdcm { //----------------------------------------------------------------------------- // Public -/** - * \brief Gets a Dicom Element inside a SQ Item Entry, by name - * @param name of the element to be found. - * @return - */ -DocEntry* DocEntrySet::GetDocEntryByName( TagName const & name ) -{ - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *dictEntry = pubDict->GetDictEntryByName(name); - if( !dictEntry ) - { - return 0; - } - - return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); -} - - -/** - * \brief Get the value of a Dicom Element inside a SQ Item Entry, by name - * @param name : name of the searched element. - * @return - */ - -std::string DocEntrySet::GetEntryByName(TagName const & name) -{ - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *dictEntry = pubDict->GetDictEntryByName(name); - - if( !dictEntry ) - { - return GDCM_UNFOUND; - } - 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 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 vr VR (Value Representation) of the underlying DictEntry + * @param vm VM (Value Multiplicity) of the underlying DictEntry * @param name english name */ DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem, TagName const & vr, - TagName const & fourth, + TagName const & vm, TagName const & name ) { - return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,fourth,name); + return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,vm,name); } //----------------------------------------------------------------------------- @@ -97,17 +60,16 @@ DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem, * @param elem element number of the new Entry * @param vr VR of the new Entry */ -ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group,uint16_t elem, - TagName const & vr) +ValEntry *DocEntrySet::NewValEntry(uint16_t group,uint16_t elem, + TagName const & vr) { - DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); - assert(dictEntry); + DictEntry *dictEntry = GetDictEntry(group, elem, vr); + gdcmAssertMacro(dictEntry); ValEntry *newEntry = new ValEntry(dictEntry); if (!newEntry) { - dbg.Verbose(1, "Document::NewValEntryByNumber", - "failed to allocate ValEntry"); + gdcmVerboseMacro( "Failed to allocate ValEntry"); return 0; } return newEntry; @@ -122,17 +84,16 @@ ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group,uint16_t elem, * @param elem element number of the new Entry * @param vr VR of the new Entry */ -BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,uint16_t elem, - TagName const & vr) +BinEntry *DocEntrySet::NewBinEntry(uint16_t group,uint16_t elem, + TagName const & vr) { - DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); - assert(dictEntry); + DictEntry *dictEntry = GetDictEntry(group, elem, vr); + gdcmAssertMacro(dictEntry); BinEntry *newEntry = new BinEntry(dictEntry); if (!newEntry) { - dbg.Verbose(1, "Document::NewBinEntryByNumber", - "failed to allocate BinEntry"); + gdcmVerboseMacro( "Failed to allocate BinEntry"); return 0; } return newEntry; @@ -145,44 +106,20 @@ BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,uint16_t elem, * @param group group number of the new Entry * @param elem element number of the new Entry */ -SeqEntry* DocEntrySet::NewSeqEntryByNumber(uint16_t group,uint16_t elem) +SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group,uint16_t elem) { - DictEntry *dictEntry = GetDictEntryByNumber(group, elem, "SQ"); - assert(dictEntry); + DictEntry *dictEntry = GetDictEntry(group, elem, "SQ"); + gdcmAssertMacro(dictEntry); SeqEntry *newEntry = new SeqEntry( dictEntry ); if (!newEntry) { - dbg.Verbose(1, "Document::NewSeqEntryByNumber", - "failed to allocate SeqEntry"); + gdcmVerboseMacro( "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. - * The public dictionary has precedence on the shadow one. - * @param name Name of the searched DictEntry - * @return Corresponding DictEntry when it exists, NULL otherwise. - */ -DictEntry *DocEntrySet::GetDictEntryByName(TagName const & name) -{ - DictEntry *found = 0; - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - if (!pubDict) - { - dbg.Verbose(0, "Document::GetDictEntry", - "we SHOULD have a default dictionary"); - } - else - { - found = pubDict->GetDictEntryByName(name); - } - return found; -} - /** * \brief Searches both the public and the shadow dictionary (when they * exist) for the presence of the DictEntry with given @@ -192,43 +129,51 @@ DictEntry *DocEntrySet::GetDictEntryByName(TagName const & name) * @param elem element number of the searched DictEntry * @return Corresponding DictEntry when it exists, NULL otherwise. */ -DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group,uint16_t elem) +DictEntry *DocEntrySet::GetDictEntry(uint16_t group,uint16_t elem) { DictEntry *found = 0; Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); if (!pubDict) { - dbg.Verbose(0, "Document::GetDictEntry", - "we SHOULD have a default dictionary"); + gdcmVerboseMacro( "We SHOULD have a default dictionary"); } else { - found = pubDict->GetDictEntryByNumber(group, elem); + found = pubDict->GetDictEntry(group, elem); } return found; } -DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group, uint16_t elem, +DictEntry *DocEntrySet::GetDictEntry(uint16_t group, uint16_t elem, TagName const & vr) { - DictEntry *dictEntry = GetDictEntryByNumber(group,elem); + DictEntry *dictEntry = GetDictEntry(group,elem); DictEntry *goodEntry = dictEntry; - std::string goodVR=vr; + std::string goodVR = vr; - if (elem==0x0000) - goodVR="UL"; + if (elem == 0x0000) goodVR="UL"; - if (goodEntry) - if (goodEntry->GetVR() != goodVR && goodVR!=GDCM_UNKNOWN) - goodEntry=NULL; + if ( goodEntry ) + { + if ( goodVR != goodEntry->GetVR() + && 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 = NewVirtualDictEntry(group, elem, goodVR, "FIXME", + dictEntry->GetName() ); + } else + { goodEntry = NewVirtualDictEntry(group, elem, goodVR); + } } return goodEntry;