Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 13:35:38 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2005/01/23 10:12:33 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-----------------------------------------------------------------------------
// Public
+
+/**
+ * \brief Request a new virtual dict entry to the dict set
+ * @param group group number of the underlying DictEntry
+ * @param elem element number of the underlying DictEntry
+ * @param vr VR (Value Representation) of the underlying DictEntry
+ * @param vm VM (Value Multiplicity) of the underlying DictEntry
+ * @param name english name
+ */
+DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem,
+ TagName const & vr,
+ TagName const & vm,
+ TagName const & name )
+{
+ return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,vm,name);
+}
+
+//-----------------------------------------------------------------------------
+// Protected
/**
* \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 new Entry
+ * @param elem element number of the new Entry
+ * @param vr VR of the new Entry
*/
-ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group,
- uint16_t elem)
+ValEntry *DocEntrySet::NewValEntry(uint16_t group,uint16_t elem,
+ TagName const & vr)
{
- // Find out if the tag we encountered is in the dictionaries:
- DictEntry *dictEntry = GetDictEntryByNumber(group, elem);
- if (!dictEntry)
- {
- dictEntry = NewVirtualDictEntry(group, elem);
- }
+ DictEntry *dictEntry = GetDictEntry(group, elem, vr);
+ gdcmAssertMacro(dictEntry);
ValEntry *newEntry = new ValEntry(dictEntry);
if (!newEntry)
{
- dbg.Verbose(1, "Document::NewValEntryByNumber",
- "failed to allocate ValEntry");
+ gdcmVerboseMacro( "Failed to allocate ValEntry");
return 0;
}
return newEntry;
* \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 new Entry
+ * @param elem element number of the new Entry
+ * @param vr VR of the new Entry
*/
-BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,
- uint16_t elem)
+BinEntry *DocEntrySet::NewBinEntry(uint16_t group,uint16_t elem,
+ TagName const & vr)
{
- // Find out if the tag we encountered is in the dictionaries:
- DictEntry *dictEntry = GetDictEntryByNumber(group, elem);
- if (!dictEntry)
- {
- dictEntry = NewVirtualDictEntry(group, elem);
- }
+ DictEntry *dictEntry = GetDictEntry(group, elem, vr);
+ gdcmAssertMacro(dictEntry);
BinEntry *newEntry = new BinEntry(dictEntry);
if (!newEntry)
{
- dbg.Verbose(1, "Document::NewBinEntryByNumber",
- "failed to allocate BinEntry");
+ gdcmVerboseMacro( "Failed to allocate BinEntry");
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
+ * @param group group number of the new Entry
+ * @param elem element number of the new Entry
*/
-SeqEntry* DocEntrySet::NewSeqEntryByNumber(uint16_t Group,
- uint16_t Elem)
+SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group,uint16_t elem)
{
- // Find out if the tag we encountered is in the dictionaries:
- DictEntry* DictEntry = GetDictEntryByNumber( Group, Elem );
- if ( ! DictEntry )
- {
- DictEntry = NewVirtualDictEntry(Group, Elem);
- }
+ DictEntry *dictEntry = GetDictEntry(group, elem, "SQ");
+ gdcmAssertMacro(dictEntry);
- SeqEntry *NewEntry = new SeqEntry( DictEntry );
- if ( !NewEntry )
+ SeqEntry *newEntry = new SeqEntry( dictEntry );
+ if (!newEntry)
{
- dbg.Verbose(1, "Document::NewSeqEntryByNumber",
- "failed to allocate SeqEntry");
+ gdcmVerboseMacro( "Failed to allocate SeqEntry");
return 0;
}
- return NewEntry;
-}
-
-//-----------------------------------------------------------------------------
-// Protected
-
-/**
- * \brief Gets a Dicom Element inside a SQ Item Entry, by name
- * @param name of the element to be found.
- * @return
- */
-DocEntry* DocEntrySet::GetDocEntryByName( TagName const & name )
-{
- Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
- DictEntry *dictEntry = pubDict->GetDictEntryByName(name);
- if( !dictEntry )
- {
- return 0;
- }
-
- return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
-}
-
-
-/**
- * \brief Get the value of a Dicom Element inside a SQ Item Entry, by name
- * @param name : name of the searched element.
- * @return
- */
-
-std::string DocEntrySet::GetEntryByName(TagName const & name)
-{
- Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
- DictEntry *dictEntry = pubDict->GetDictEntryByName(name);
-
- if( !dictEntry )
- {
- return GDCM_UNFOUND;
- }
-
- return GetEntryByNumber(dictEntry->GetGroup(), dictEntry->GetElement());
-}
-
-
-/**
- * \brief Request a new virtual dict entry to the dict set
- * @param group group number of the underlying DictEntry
- * @param element element number of the underlying DictEntry
- * @param vr VR of the underlying DictEntry
- * @param fourth owner group
- * @param name english 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);
-}
-
-/** \brief
- * Creates a new DocEntry (without any 'value' ...)
- * @param group group number of the underlying DictEntry
- * @param elem elem number of the underlying DictEntry
- */
-DocEntry* DocEntrySet::NewDocEntryByNumber(uint16_t group,
- uint16_t elem)
-{
- // 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);
- }
-
- DocEntry *newEntry = new DocEntry(dictEntry);
- if (!newEntry)
- {
- dbg.Verbose(1, "SQItem::NewDocEntryByNumber",
- "failed to allocate DocEntry");
- return 0;
- }
- return newEntry;
-}
-
-
-/** \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);
- std::string goodVR = vr;
- DictEntry *goodDict = dictEntry;
-
- // Check if the would VR is good
- if (elem==0x0000)
- goodVR="UL";
-
- // Check if the DictEntry VR corresponds with the would VR
- if (goodDict)
- if (goodDict->GetVR() != goodVR && goodVR!=GDCM_UNKNOWN)
- goodDict=NULL;
-
- // Create a new virtual DictEntry if necessary
- if (!goodDict)
- {
- if (dictEntry)
- goodDict = NewVirtualDictEntry(group, elem, goodVR,"FIXME",dictEntry->GetName());
- else
- goodDict = NewVirtualDictEntry(group, elem, goodVR);
- }
-
- // Create the DocEntry
- DocEntry *newEntry = new DocEntry(goodDict);
- 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)
-{
- Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
- DictEntry *newTag = pubDict->GetDictEntryByName(name);
- if (!newTag)
- {
- newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", GDCM_UNKNOWN, name);
- }
-
- DocEntry* newEntry = new DocEntry(newTag);
- if (!newEntry)
- {
- dbg.Verbose(1, "SQItem::ObtainDocEntryByName",
- "failed to allocate DocEntry");
- return 0;
- }
-
return newEntry;
}
-
/**
- * \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
+ * \brief Searches [both] the public [and the shadow dictionary (when they
+ * exist)] for the presence of the DictEntry with given
+ * group and element. The public dictionary has precedence on the
+ * shadow one.
+ * @param group group number of the searched DictEntry
+ * @param elem element number of the searched DictEntry
* @return Corresponding DictEntry when it exists, NULL otherwise.
*/
-DictEntry *DocEntrySet::GetDictEntryByName(TagName const & name)
+DictEntry *DocEntrySet::GetDictEntry(uint16_t group,uint16_t elem)
{
DictEntry *found = 0;
Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
if (!pubDict)
{
- dbg.Verbose(0, "Document::GetDictEntry",
- "we SHOULD have a default dictionary");
+ gdcmVerboseMacro( "We SHOULD have a default dictionary");
}
else
{
- found = pubDict->GetDictEntryByName(name);
+ found = pubDict->GetDictEntry(group, elem);
}
return found;
}
+
/**
* \brief Searches both the public and the shadow dictionary (when they
* exist) for the presence of the DictEntry with given
- * group and element. The public dictionary has precedence on the
- * shadow one.
- * @param group group number of the searched DictEntry
- * @param element element number of the searched DictEntry
+ * group and element, and create a new virtual DictEntry if necessary
+ * @param group group number of the searched DictEntry
+ * @param elem element number of the searched DictEntry
+ * @param vr Value Representation to use, if necessary
* @return Corresponding DictEntry when it exists, NULL otherwise.
*/
-DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group,
- uint16_t element)
+DictEntry *DocEntrySet::GetDictEntry(uint16_t group, uint16_t elem,
+ TagName const & vr)
{
- DictEntry *found = 0;
- Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
- if (!pubDict)
+ DictEntry *dictEntry = GetDictEntry(group,elem);
+ DictEntry *goodEntry = dictEntry;
+ std::string goodVR = vr;
+
+ if (elem == 0x0000) goodVR="UL";
+
+ if ( goodEntry )
{
- dbg.Verbose(0, "Document::GetDictEntry",
- "we SHOULD have a default dictionary");
+ if ( goodVR != goodEntry->GetVR()
+ && goodVR != GDCM_UNKNOWN )
+ {
+ goodEntry = NULL;
+ }
}
- else
+
+ // Create a new virtual DictEntry if necessary
+ if (!goodEntry)
{
- found = pubDict->GetDictEntryByNumber(group, element);
+ if (dictEntry)
+ {
+ goodEntry = NewVirtualDictEntry(group, elem, goodVR, "FIXME",
+ dictEntry->GetName() );
+ }
+ else
+ {
+ goodEntry = NewVirtualDictEntry(group, elem, goodVR);
+ }
}
- return found;
+ return goodEntry;
}
+
//-----------------------------------------------------------------------------
// Private
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff