Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2004/10/27 22:47:20 $
- Version: $Revision: 1.43 $
+ Date: $Date: 2005/01/07 22:03:30 $
+ Version: $Revision: 1.49 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* contained is this DictSet, along with their respective content.
* @param os Output stream used for printing.
*/
-void DictSet::Print(std::ostream& os)
+void DictSet::Print(std::ostream &os)
{
for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict)
{
* \sa DictSet::GetPubDictTagNamesByCategory
* @return A list of all entries of the public dicom dictionnary.
*/
-EntryNamesList * DictSet::GetPubDictEntryNames()
-{
- return GetDefaultPubDict()->GetDictEntryNames();
-}
+
+// Probabely useless!
+
+//EntryNamesList *DictSet::GetPubDictEntryNames()
+//{
+// return GetDefaultPubDict()->GetDictEntryNames();
+//}
/**
* \ingroup DictSet
* values are lists of all the dictionnary entries among that
* group. Note that apparently the Dicom standard doesn't explicitely
* define a name (as a string) for each group.
+ * NO ! Dicom Standard explicitely doesn't define
+ * any name, for any group !
* - A typical usage of this method would be to enable a dynamic
* configuration of a Dicom file browser: the admin/user can
* select in the interface which Dicom tags should be displayed.
* corresponding values are lists of all the dictionnary entries
* among that group.
*/
-EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory()
-{
- return GetDefaultPubDict()->GetDictEntryNamesByCategory();
-}
+
+
+// Probabely useless!
+
+//EntryNamesByCatMap *DictSet::GetPubDictEntryNamesByCategory()
+//{
+// return GetDefaultPubDict()->GetDictEntryNamesByCategory();
+//}
/**
* \ingroup DictSet
* @param dictName The symbolic name of the searched dictionary.
* \result The retrieved dictionary.
*/
-Dict *DictSet::GetDict(DictKey const & dictName)
+Dict *DictSet::GetDict(DictKey const &dictName)
{
DictSetHT::iterator dict = Dicts.find(dictName);
if(dict != Dicts.end())
DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
uint16_t element,
TagName vr,
- TagName fourth,
+ TagName vm,
TagName name)
{
DictEntry *entry;
const std::string tag = DictEntry::TranslateToKey(group,element)
- + "#" + vr + "#" + fourth + "#" + name;
+ + "#" + vr + "#" + vm + "#" + name;
TagKeyHT::iterator it;
it = VirtualEntry.find(tag);
}
else
{
- DictEntry ent(group, element, vr, fourth, name);
+ DictEntry ent(group, element, vr, vm, name);
VirtualEntry.insert(
- TagKeyHT::value_type<TagKey, DictEntry>
+ std::map<TagKey, DictEntry>::value_type
(tag, ent));
entry = &(VirtualEntry.find(tag)->second);
}
{
resultPath += '/';
}
- dbg.Verbose(1, "DictSet::BuildDictPath:",
- "Dictionary path set from environnement");
+ gdcmVerboseMacro( "Dictionary path set from environnement");
}
else
{
//-----------------------------------------------------------------------------
// Protected
-bool DictSet::AppendDict(Dict *newDict, DictKey const & name)
+bool DictSet::AppendDict(Dict *newDict, DictKey const &name)
{
Dicts[name] = newDict;