X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=4f0e9ce2f648be9ae792cff907d25c01fc44223c;hb=b868cc4addde15e2f692a7b1fe9451c1335258f4;hp=ad85c126b587ea5891a97d487b51fb42f1f6d63f;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index ad85c126..4f0e9ce2 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,217 +3,121 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2004/07/02 13:55:27 $ - Version: $Revision: 1.13 $ + Date: $Date: 2005/01/07 22:24:00 $ + Version: $Revision: 1.40 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ +#include "gdcmDocEntrySet.h" -#include #include "gdcmDebug.h" #include "gdcmCommon.h" +#include "gdcmDictSet.h" #include "gdcmGlobal.h" -#include "gdcmDocEntrySet.h" #include "gdcmException.h" #include "gdcmDocEntry.h" #include "gdcmSeqEntry.h" #include "gdcmValEntry.h" #include "gdcmBinEntry.h" -//----------------------------------------------------------------------------- -// Constructor / Destructor -/** - * \ingroup gdcmDocEntrySet - * \brief Constructor from a given gdcmDocEntrySet - */ -gdcmDocEntrySet::gdcmDocEntrySet(int depthLevel) { - SQDepthLevel = depthLevel + 1; -} -/** - * \brief Canonical destructor. - */ -gdcmDocEntrySet::~gdcmDocEntrySet(){ -} -//----------------------------------------------------------------------------- -// Print -/* - * \ingroup gdcmDocEntrySet - * \brief canonical Printer - */ - +namespace gdcm +{ //----------------------------------------------------------------------------- // Public - /** - * \brief Build a new Element Value 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 + * \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 (Value Representation) of the underlying DictEntry + * @param vm VM (Value Multiplicity) of the underlying DictEntry + * @param name english name */ -gdcmValEntry *gdcmDocEntrySet::NewValEntryByNumber(uint16_t Group, - uint16_t Elem) +DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem, + TagName const & vr, + TagName const & vm, + TagName const & name ) { - // Find out if the tag we encountered is in the dictionaries: - gdcmDictEntry *DictEntry = GetDictEntryByNumber(Group, Elem); - if (!DictEntry) - DictEntry = NewVirtualDictEntry(Group, Elem); - - gdcmValEntry *NewEntry = new gdcmValEntry(DictEntry); - if (!NewEntry) - { - dbg.Verbose(1, "gdcmDocument::NewValEntryByNumber", - "failed to allocate gdcmValEntry"); - return NULL; - } - return NewEntry; + return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,vm,name); } - +//----------------------------------------------------------------------------- +// Protected /** - * \brief Build a new Element Value from all the low level arguments. + * \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 + * @param group group number of the new Entry + * @param elem element number of the new Entry + * @param vr VR of the new Entry */ -gdcmBinEntry *gdcmDocEntrySet::NewBinEntryByNumber(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: - gdcmDictEntry *DictEntry = GetDictEntryByNumber(Group, Elem); - if (!DictEntry) - DictEntry = NewVirtualDictEntry(Group, Elem); + DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); + gdcmAssertMacro(dictEntry); - gdcmBinEntry *NewEntry = new gdcmBinEntry(DictEntry); - if (!NewEntry) + ValEntry *newEntry = new ValEntry(dictEntry); + if (!newEntry) { - dbg.Verbose(1, "gdcmDocument::NewBinEntryByNumber", - "failed to allocate gdcmBinEntry"); - return NULL; + gdcmVerboseMacro( "Failed to allocate ValEntry"); + return 0; } - return NewEntry; -} -//----------------------------------------------------------------------------- -// Protected - -/** - * \brief Gets a Dicom Element inside a SQ Item Entry, by name - * @return - */ - gdcmDocEntry *gdcmDocEntrySet::GetDocEntryByName(std::string name) { - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = (*PubDict).GetDictEntryByName(name); - if( dictEntry == NULL) - return NULL; - 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 gdcmDocEntrySet::GetEntryByName(TagName name) { - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = (*PubDict).GetDictEntryByName(name); - - if( dictEntry == NULL) - return GDCM_UNFOUND; - return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); + return newEntry; } /** - * \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 vr VR of the underlying DictEntry - * @param fourth owner group - * @param name english name + * \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 */ -gdcmDictEntry* gdcmDocEntrySet::NewVirtualDictEntry(uint16_t group, - uint16_t element, - std::string vr, - std::string fourth, - std::string name) +BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,uint16_t elem, + TagName const & vr) { - return gdcmGlobal::GetDicts()->NewVirtualDictEntry(group,element,vr,fourth,name); -} + DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); + gdcmAssertMacro(dictEntry); -/** \brief - * Probabely move, as is, to gdcmDocEntrySet, as a non virtual method - * an remove gdcmDocument::NewDocEntryByNumber - */ -gdcmDocEntry* gdcmDocEntrySet::NewDocEntryByNumber(uint16_t group, - uint16_t elem) -{ - // Find out if the tag we encountered is in the dictionaries: - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *DictEntry = (*PubDict).GetDictEntryByNumber(group, elem); - if (!DictEntry) - DictEntry = NewVirtualDictEntry(group, elem); - - gdcmDocEntry *NewEntry = new gdcmDocEntry(DictEntry); - if (!NewEntry) + BinEntry *newEntry = new BinEntry(dictEntry); + if (!newEntry) { - dbg.Verbose(1, "gdcmSQItem::NewDocEntryByNumber", - "failed to allocate gdcmDocEntry"); - return (gdcmDocEntry*)0; + gdcmVerboseMacro( "Failed to allocate BinEntry"); + return 0; } - return NewEntry; + return newEntry; } -/// \brief -gdcmDocEntry *gdcmDocEntrySet::NewDocEntryByName (std::string Name) { - - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *NewTag = (*PubDict).GetDictEntryByName(Name); - if (!NewTag) - NewTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", Name); - - gdcmDocEntry* NewEntry = new gdcmDocEntry(NewTag); - if (!NewEntry) - { - dbg.Verbose(1, "gdcmSQItem::ObtainDocEntryByName", - "failed to allocate gdcmDocEntry"); - return (gdcmDocEntry *)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. + * \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 */ -gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByName(std::string Name) +SeqEntry* DocEntrySet::NewSeqEntryByNumber(uint16_t group,uint16_t elem) { - gdcmDictEntry *found = (gdcmDictEntry *)0; - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - if (!PubDict) + DictEntry *dictEntry = GetDictEntryByNumber(group, elem, "SQ"); + gdcmAssertMacro(dictEntry); + + SeqEntry *newEntry = new SeqEntry( dictEntry ); + if (!newEntry) { - dbg.Verbose(0, "gdcmDocument::GetDictEntry", - "we SHOULD have a default dictionary"); + gdcmVerboseMacro( "Failed to allocate SeqEntry"); + return 0; } - else - found = PubDict->GetDictEntryByName(Name); - return found; + return newEntry; } /** @@ -222,27 +126,62 @@ gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByName(std::string 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. */ -gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByNumber(uint16_t group, - uint16_t element) +DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group,uint16_t elem) { - gdcmDictEntry *found = (gdcmDictEntry *)0; - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - if (!PubDict) + DictEntry *found = 0; + Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); + if (!pubDict) { - dbg.Verbose(0, "gdcmDocument::GetDictEntry", - "we SHOULD have a default dictionary"); + gdcmVerboseMacro( "We SHOULD have a default dictionary"); + } + else + { + found = pubDict->GetDictEntryByNumber(group, elem); } - else - found = PubDict->GetDictEntryByNumber(group, element); 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 ( 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() ); + } + else + { + goodEntry = NewVirtualDictEntry(group, elem, goodVR); + } + } + + return goodEntry; +} //----------------------------------------------------------------------------- // Private +} // end namespace gdcm //-----------------------------------------------------------------------------