X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=abc0885ecae368ccdc1c425b03cfd1a583113041;hb=ddf499835a21348b252936d10fbf4305d3c1e3ad;hp=e33a0cbc06dbcf060661c8b820800e154df9640b;hpb=ecac4d36edf15736ae8f516ef3f9d8a6396ed54c;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index e33a0cbc..abc0885e 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/08/01 03:20:23 $ - Version: $Revision: 1.15 $ + Date: $Date: 2004/08/31 15:39:48 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -56,11 +56,11 @@ gdcmDocEntrySet::~gdcmDocEntrySet() /** - * \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) @@ -84,11 +84,11 @@ gdcmValEntry *gdcmDocEntrySet::NewValEntryByNumber(uint16_t group, /** - * \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 + * @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) @@ -109,6 +109,31 @@ gdcmBinEntry *gdcmDocEntrySet::NewBinEntryByNumber(uint16_t group, } 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 + */ +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) + DictEntry = NewVirtualDictEntry(Group, Elem); + + gdcmSeqEntry *NewEntry = new gdcmSeqEntry(DictEntry, 1); // FIXME : 1 + if (!NewEntry) + { + dbg.Verbose(1, "gdcmDocument::NewSeqEntryByNumber", + "failed to allocate gdcmSeqEntry"); + return NULL; + } + return NewEntry; +} //----------------------------------------------------------------------------- // Protected @@ -191,7 +216,10 @@ gdcmDocEntry* gdcmDocEntrySet::NewDocEntryByNumber(uint16_t group, return newEntry; } -/// \brief +/* \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(); @@ -217,7 +245,7 @@ gdcmDocEntry *gdcmDocEntrySet::NewDocEntryByName (std::string const & 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 const & name)