Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.cxx,v $
Language: C++
- Date: $Date: 2004/07/30 11:40:13 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2004/08/26 15:29:52 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \ingroup gdcmDocEntrySet
* \brief Constructor from a given gdcmDocEntrySet
*/
-gdcmDocEntrySet::gdcmDocEntrySet(int depthLevel) {
- SQDepthLevel = depthLevel + 1;
+gdcmDocEntrySet::gdcmDocEntrySet(int depthLevel)
+{
+ SQDepthLevel = depthLevel + 1; //magic +1 !
}
/**
* \brief Canonical destructor.
*/
-gdcmDocEntrySet::~gdcmDocEntrySet(){
+gdcmDocEntrySet::~gdcmDocEntrySet()
+{
}
//-----------------------------------------------------------------------------
// Print
/**
- * \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
*/
-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:
if (!DictEntry)
DictEntry = NewVirtualDictEntry(Group, Elem);
- gdcmBinEntry *NewEntry = new gdcmBinEntry(DictEntry);
+ gdcmSeqEntry *NewEntry = new gdcmSeqEntry(DictEntry, 1); // FIXME : 1
if (!NewEntry)
{
- dbg.Verbose(1, "gdcmDocument::NewBinEntryByNumber",
- "failed to allocate gdcmBinEntry");
+ dbg.Verbose(1, "gdcmDocument::NewSeqEntryByNumber",
+ "failed to allocate gdcmSeqEntry");
return NULL;
}
return NewEntry;
* \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());
}
* @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());
}
*/
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);
}
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);
+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)
+ 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;
}
* @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;
}
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;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff