Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.cxx,v $
Language: C++
- Date: $Date: 2004/08/31 14:24:47 $
- Version: $Revision: 1.17 $
+ 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
- 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 "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)
+namespace gdcm
{
- SQDepthLevel = depthLevel + 1; //magic +1 !
-}
-/**
- * \brief Canonical destructor.
- */
-gdcmDocEntrySet::~gdcmDocEntrySet()
-{
-}
-//-----------------------------------------------------------------------------
-// Print
-/*
- * \ingroup gdcmDocEntrySet
- * \brief canonical Printer
- */
-
//-----------------------------------------------------------------------------
// Public
-
-
/**
* \brief Build a new Val Entry from all the low level arguments.
* Check for existence of dictionary entry, and build
* @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)
+ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group,
+ uint16_t elem)
{
// Find out if the tag we encountered is in the dictionaries:
- gdcmDictEntry *dictEntry = GetDictEntryByNumber(group, elem);
+ DictEntry *dictEntry = GetDictEntryByNumber(group, elem);
if (!dictEntry)
{
dictEntry = NewVirtualDictEntry(group, elem);
}
- gdcmValEntry *newEntry = new gdcmValEntry(dictEntry);
+ ValEntry *newEntry = new ValEntry(dictEntry);
if (!newEntry)
{
- dbg.Verbose(1, "gdcmDocument::NewValEntryByNumber",
- "failed to allocate gdcmValEntry");
+ dbg.Verbose(1, "Document::NewValEntryByNumber",
+ "failed to allocate ValEntry");
return 0;
}
return newEntry;
* @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)
+BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,
+ uint16_t elem)
{
// Find out if the tag we encountered is in the dictionaries:
- gdcmDictEntry *dictEntry = GetDictEntryByNumber(group, elem);
+ DictEntry *dictEntry = GetDictEntryByNumber(group, elem);
if (!dictEntry)
{
dictEntry = NewVirtualDictEntry(group, elem);
}
- gdcmBinEntry *newEntry = new gdcmBinEntry(dictEntry);
+ BinEntry *newEntry = new BinEntry(dictEntry);
if (!newEntry)
{
- dbg.Verbose(1, "gdcmDocument::NewBinEntryByNumber",
- "failed to allocate gdcmBinEntry");
+ dbg.Verbose(1, "Document::NewBinEntryByNumber",
+ "failed to allocate BinEntry");
return 0;
}
return newEntry;
* @param Group group number of the underlying DictEntry
* @param Elem element number of the underlying DictEntry
*/
-gdcmSeqEntry *gdcmDocEntrySet::NewSeqEntryByNumber(uint16_t Group,
+SeqEntry* DocEntrySet::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* DictEntry = GetDictEntryByNumber( Group, Elem );
+ if ( ! DictEntry )
+ {
DictEntry = NewVirtualDictEntry(Group, Elem);
+ }
- gdcmSeqEntry *NewEntry = new gdcmSeqEntry(DictEntry, 1); // FIXME : 1
- if (!NewEntry)
+ SeqEntry *NewEntry = new SeqEntry( DictEntry );
+ if ( !NewEntry )
{
- dbg.Verbose(1, "gdcmDocument::NewSeqEntryByNumber",
- "failed to allocate gdcmSeqEntry");
- return NULL;
+ dbg.Verbose(1, "Document::NewSeqEntryByNumber",
+ "failed to allocate SeqEntry");
+ return 0;
}
return NewEntry;
}
+
//-----------------------------------------------------------------------------
// 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
*/
- gdcmDocEntry *gdcmDocEntrySet::GetDocEntryByName(std::string const & name)
- {
- gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
- gdcmDictEntry *dictEntry = pubDict->GetDictEntryByName(name);
+DocEntry* DocEntrySet::GetDocEntryByName( TagName const & name )
+{
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
+ DictEntry *dictEntry = pubDict->GetDictEntryByName(name);
if( !dictEntry )
{
return 0;
* @return
*/
-std::string gdcmDocEntrySet::GetEntryByName(TagName const & name)
+std::string DocEntrySet::GetEntryByName(TagName const & name)
{
- gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
- gdcmDictEntry *dictEntry = pubDict->GetDictEntryByName(name);
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
+ DictEntry *dictEntry = pubDict->GetDictEntryByName(name);
if( !dictEntry )
{
* @param fourth owner group
* @param name english name
*/
-gdcmDictEntry* gdcmDocEntrySet::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 gdcmGlobal::GetDicts()->NewVirtualDictEntry(group,element,vr,fourth,name);
+ return Global::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)
+DocEntry* DocEntrySet::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);
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
+ DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem);
if (!dictEntry)
{
dictEntry = NewVirtualDictEntry(group, elem);
}
- gdcmDocEntry *newEntry = new gdcmDocEntry(dictEntry);
+ DocEntry *newEntry = new DocEntry(dictEntry);
if (!newEntry)
{
- dbg.Verbose(1, "gdcmSQItem::NewDocEntryByNumber",
- "failed to allocate gdcmDocEntry");
+ dbg.Verbose(1, "SQItem::NewDocEntryByNumber",
+ "failed to allocate DocEntry");
return 0;
}
return newEntry;
}
-/// \brief
-gdcmDocEntry *gdcmDocEntrySet::NewDocEntryByName (std::string const & 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-
+ */
+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);
+ }
+
+ DocEntry *newEntry = new DocEntry(dictEntry);
+ if (!newEntry)
+ {
+ dbg.Verbose(1, "SQItem::NewDocEntryByNumber",
+ "failed to allocate DocEntry");
+ return 0;
+ }
+ return newEntry;
+}
+/* \brief
+ * Probabely move, as is, to DocEntrySet, as a non virtual method
+ * and remove Document::NewDocEntryByName
+ */
+DocEntry *DocEntrySet::NewDocEntryByName(TagName const & name)
{
- gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
- gdcmDictEntry *newTag = pubDict->GetDictEntryByName(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);
}
- gdcmDocEntry* newEntry = new gdcmDocEntry(newTag);
+ DocEntry* newEntry = new DocEntry(newTag);
if (!newEntry)
{
- dbg.Verbose(1, "gdcmSQItem::ObtainDocEntryByName",
- "failed to allocate gdcmDocEntry");
+ dbg.Verbose(1, "SQItem::ObtainDocEntryByName",
+ "failed to allocate DocEntry");
return 0;
}
* @param name Name of the searched DictEntry
* @return Corresponding DictEntry when it exists, NULL otherwise.
*/
-gdcmDictEntry *gdcmDocEntrySet::GetDictEntryByName(std::string const & name)
+DictEntry *DocEntrySet::GetDictEntryByName(TagName const & name)
{
- gdcmDictEntry *found = 0;
- gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
+ DictEntry *found = 0;
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
if (!pubDict)
{
- dbg.Verbose(0, "gdcmDocument::GetDictEntry",
+ dbg.Verbose(0, "Document::GetDictEntry",
"we SHOULD have a default dictionary");
}
else
* @param element 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 element)
{
- gdcmDictEntry *found = 0;
- gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
+ DictEntry *found = 0;
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
if (!pubDict)
{
- dbg.Verbose(0, "gdcmDocument::GetDictEntry",
+ dbg.Verbose(0, "Document::GetDictEntry",
"we SHOULD have a default dictionary");
}
else
//-----------------------------------------------------------------------------
// Private
+} // end namespace gdcm
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff