X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocEntrySet.cxx;h=d5ca85e24277d5fb037ee2c7ae274540a36e3f93;hb=8a806c5653d7832005f2c6f658cf8b5fa612f656;hp=ad85c126b587ea5891a97d487b51fb42f1f6d63f;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index ad85c126..d5ca85e2 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/07/02 13:55:27 $ - Version: $Revision: 1.13 $ + Date: $Date: 2004/09/16 19:21:57 $ + Version: $Revision: 1.22 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,7 +16,6 @@ =========================================================================*/ -#include #include "gdcmDebug.h" #include "gdcmCommon.h" #include "gdcmGlobal.h" @@ -27,83 +26,91 @@ #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 - */ - - //----------------------------------------------------------------------------- // Public - - /** - * \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 underlying DictEntry + * @param elem element number of the underlying DictEntry */ -gdcmValEntry *gdcmDocEntrySet::NewValEntryByNumber(uint16_t Group, - uint16_t Elem) +gdcmValEntry *gdcmDocEntrySet::NewValEntryByNumber(uint16_t group, + uint16_t elem) { // Find out if the tag we encountered is in the dictionaries: - gdcmDictEntry *DictEntry = GetDictEntryByNumber(Group, Elem); - if (!DictEntry) - DictEntry = NewVirtualDictEntry(Group, Elem); + gdcmDictEntry *dictEntry = GetDictEntryByNumber(group, elem); + if (!dictEntry) + { + dictEntry = NewVirtualDictEntry(group, elem); + } - gdcmValEntry *NewEntry = new gdcmValEntry(DictEntry); - if (!NewEntry) + gdcmValEntry *newEntry = new gdcmValEntry(dictEntry); + if (!newEntry) { dbg.Verbose(1, "gdcmDocument::NewValEntryByNumber", "failed to allocate gdcmValEntry"); - return NULL; + return 0; } - return NewEntry; + return newEntry; } /** - * \brief Build a new Element Value from all the low level arguments. + * \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 + */ +gdcmBinEntry *gdcmDocEntrySet::NewBinEntryByNumber(uint16_t group, + uint16_t elem) +{ + // Find out if the tag we encountered is in the dictionaries: + gdcmDictEntry *dictEntry = GetDictEntryByNumber(group, elem); + if (!dictEntry) + { + dictEntry = NewVirtualDictEntry(group, elem); + } + + gdcmBinEntry *newEntry = new gdcmBinEntry(dictEntry); + if (!newEntry) + { + dbg.Verbose(1, "gdcmDocument::NewBinEntryByNumber", + "failed to allocate gdcmBinEntry"); + 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 */ -gdcmBinEntry *gdcmDocEntrySet::NewBinEntryByNumber(uint16_t Group, +gdcmSeqEntry* gdcmDocEntrySet::NewSeqEntryByNumber(uint16_t Group, uint16_t Elem) { // Find out if the tag we encountered is in the dictionaries: - gdcmDictEntry *DictEntry = GetDictEntryByNumber(Group, Elem); - if (!DictEntry) + gdcmDictEntry* DictEntry = GetDictEntryByNumber( Group, Elem ); + if ( ! DictEntry ) + { DictEntry = NewVirtualDictEntry(Group, Elem); + } - gdcmBinEntry *NewEntry = new gdcmBinEntry(DictEntry); - if (!NewEntry) + gdcmSeqEntry *NewEntry = new gdcmSeqEntry( DictEntry ); + if ( !NewEntry ) { - dbg.Verbose(1, "gdcmDocument::NewBinEntryByNumber", - "failed to allocate gdcmBinEntry"); - return NULL; + dbg.Verbose(1, "gdcmDocument::NewSeqEntryByNumber", + "failed to allocate gdcmSeqEntry"); + return 0; } return NewEntry; } + //----------------------------------------------------------------------------- // Protected @@ -111,11 +118,15 @@ gdcmBinEntry *gdcmDocEntrySet::NewBinEntryByNumber(uint16_t Group, * \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; + gdcmDocEntry *gdcmDocEntrySet::GetDocEntryByName(std::string const & name) + { + gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + gdcmDictEntry *dictEntry = pubDict->GetDictEntryByName(name); + if( !dictEntry ) + { + return 0; + } + return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); } @@ -126,13 +137,17 @@ gdcmBinEntry *gdcmDocEntrySet::NewBinEntryByNumber(uint16_t Group, * @return */ -std::string gdcmDocEntrySet::GetEntryByName(TagName name) { - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = (*PubDict).GetDictEntryByName(name); +std::string gdcmDocEntrySet::GetEntryByName(TagName const & name) +{ + gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + gdcmDictEntry *dictEntry = pubDict->GetDictEntryByName(name); - if( dictEntry == NULL) + if( !dictEntry ) + { return GDCM_UNFOUND; - return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); + } + + return GetEntryByNumber(dictEntry->GetGroup(), dictEntry->GetElement()); } @@ -146,52 +161,90 @@ std::string gdcmDocEntrySet::GetEntryByName(TagName name) { */ gdcmDictEntry* gdcmDocEntrySet::NewVirtualDictEntry(uint16_t group, uint16_t element, - std::string vr, - std::string fourth, - std::string name) + std::string const & vr, + std::string const & fourth, + std::string const & name) { return gdcmGlobal::GetDicts()->NewVirtualDictEntry(group,element,vr,fourth,name); } /** \brief - * Probabely move, as is, to gdcmDocEntrySet, as a non virtual method - * an remove gdcmDocument::NewDocEntryByNumber + * Creates a new DocEntry (without any 'value' ...) + * @param group group number of the underlying DictEntry + * @param elem elem number of the underlying DictEntry */ 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); + gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); + if (!dictEntry) + { + dictEntry = NewVirtualDictEntry(group, elem); + } - gdcmDocEntry *NewEntry = new gdcmDocEntry(DictEntry); - if (!NewEntry) + gdcmDocEntry *newEntry = new gdcmDocEntry(dictEntry); + if (!newEntry) { dbg.Verbose(1, "gdcmSQItem::NewDocEntryByNumber", "failed to allocate gdcmDocEntry"); - return (gdcmDocEntry*)0; + 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); +/** \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- - gdcmDocEntry* NewEntry = new gdcmDocEntry(NewTag); - if (!NewEntry) + */ +gdcmDocEntry* gdcmDocEntrySet::NewDocEntryByNumber(uint16_t group, + uint16_t elem, + std::string const &VR) +{ + // 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, VR); + } + + gdcmDocEntry *newEntry = new gdcmDocEntry(dictEntry); + if (!newEntry) + { + dbg.Verbose(1, "gdcmSQItem::NewDocEntryByNumber", + "failed to allocate gdcmDocEntry"); + return 0; + } + return newEntry; +} +/* \brief + * Probabely move, as is, to gdcmDocEntrySet, as a non virtual method + * an remove gdcmDocument::NewDocEntryByName + */ +gdcmDocEntry *gdcmDocEntrySet::NewDocEntryByName (std::string const & 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 0; } - return NewEntry; + + return newEntry; } @@ -199,20 +252,22 @@ gdcmDocEntry *gdcmDocEntrySet::NewDocEntryByName (std::string Name) { * \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 + * @param name Name of the searched DictEntry * @return Corresponding DictEntry when it exists, NULL otherwise. */ -gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByName(std::string Name) +gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByName(std::string const & name) { - gdcmDictEntry *found = (gdcmDictEntry *)0; - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - if (!PubDict) + gdcmDictEntry *found = 0; + gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + if (!pubDict) { dbg.Verbose(0, "gdcmDocument::GetDictEntry", "we SHOULD have a default dictionary"); } - else - found = PubDict->GetDictEntryByName(Name); + else + { + found = pubDict->GetDictEntryByName(name); + } return found; } @@ -228,15 +283,17 @@ gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByName(std::string Name) gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByNumber(uint16_t group, uint16_t element) { - gdcmDictEntry *found = (gdcmDictEntry *)0; - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - if (!PubDict) + gdcmDictEntry *found = 0; + gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + if (!pubDict) { dbg.Verbose(0, "gdcmDocument::GetDictEntry", "we SHOULD have a default dictionary"); } - else - found = PubDict->GetDictEntryByNumber(group, element); + else + { + found = pubDict->GetDictEntryByNumber(group, element); + } return found; }