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/05 15:38:28 $
+ Version: $Revision: 1.28 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include "gdcmCommon.h"
+#include "gdcmDictSet.h"
#include "gdcmGlobal.h"
#include "gdcmException.h"
#include "gdcmDocEntry.h"
// 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 )
* @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 element,
+ TagName const & vr,
+ TagName const & fourth,
+ TagName const & name )
{
return Global::GetDicts()->NewVirtualDictEntry(group,element,vr,fourth,name);
}
* @param elem elem number of the underlying DictEntry
*/
DocEntry* DocEntrySet::NewDocEntryByNumber(uint16_t group,
- uint16_t elem)
+ uint16_t elem)
{
// Find out if the tag we encountered is in the dictionaries:
Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
* 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-
-
+ * @param vr V(alue) R(epresentation) of the Entry -if private Entry-
*/
-DocEntry* DocEntrySet::NewDocEntryByNumber(uint16_t group,
- uint16_t elem,
- std::string const &VR)
+DocEntry* DocEntrySet::NewDocEntryByNumber(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 = NewVirtualDictEntry(group, elem, vr);
}
DocEntry *newEntry = new DocEntry(dictEntry);
}
/* \brief
* Probabely move, as is, to DocEntrySet, as a non virtual method
- * an remove Document::NewDocEntryByName
+ * and remove Document::NewDocEntryByName
*/
-DocEntry *DocEntrySet::NewDocEntryByName (std::string const & name)
+DocEntry *DocEntrySet::NewDocEntryByName(TagName const & name)
{
Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
DictEntry *newTag = pubDict->GetDictEntryByName(name);
if (!newTag)
{
- newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", name);
+ newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", GDCM_UNKNOWN, name);
}
DocEntry* newEntry = new DocEntry(newTag);
* @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();
* @param element 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 element)
{
DictEntry *found = 0;
Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();