Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:45 $
- Version: $Revision: 1.38 $
+ 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
#include "gdcmDebug.h"
#include <fstream>
#include <stdlib.h> // For getenv
+
namespace gdcm
{
Dicts.clear();
// Remove virtual dictionnary entries
- std::map<std::string,DictEntry *>::iterator it;
- for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it)
- {
- DictEntry *entry = it->second;
- if ( entry )
- {
- delete entry;
- }
- it->second = NULL;
- }
+ VirtualEntry.clear();
}
//-----------------------------------------------------------------------------
* 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.
*/
-std::list<std::string> *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.
*/
-std::map<std::string, std::list<std::string> > *
- DictSet::GetPubDictEntryNamesByCategory()
-{
- return GetDefaultPubDict()->GetDictEntryNamesByCategory();
-}
+
+
+// Probabely useless!
+
+//EntryNamesByCatMap *DictSet::GetPubDictEntryNamesByCategory()
+//{
+// return GetDefaultPubDict()->GetDictEntryNamesByCategory();
+//}
/**
* \ingroup DictSet
* \brief Loads a dictionary from a specified file, and add it
* to already the existing ones contained in this DictSet.
- * @param fileName Absolute or relative filename containing the
+ * @param filename Absolute or relative filename containing the
* dictionary to load.
* @param name Symbolic name that be used as identifier of the newly
* created dictionary.
*/
-Dict *DictSet::LoadDictFromFile(std::string const & fileName,
- DictKey const & name)
+Dict *DictSet::LoadDictFromFile(std::string const & filename,
+ DictKey const & name)
{
- Dict *newDict = new Dict(fileName);
+ Dict *newDict = new Dict(filename);
AppendDict(newDict, name);
return newDict;
* @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())
* in no dictionnary
* @return virtual entry
*/
-DictEntry *DictSet::NewVirtualDictEntry(uint16_t group,
- uint16_t element,
- std::string vr,
- std::string fourth,
- std::string name)
+DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
+ uint16_t element,
+ TagName vr,
+ TagName vm,
+ TagName name)
{
- DictEntry* entry;
+ DictEntry *entry;
const std::string tag = DictEntry::TranslateToKey(group,element)
- + "#" + vr + "#" + fourth + "#" + name;
- std::map<std::string,DictEntry *>::iterator it;
+ + "#" + vr + "#" + vm + "#" + name;
+ TagKeyHT::iterator it;
it = VirtualEntry.find(tag);
if(it != VirtualEntry.end())
{
- entry = it->second;
+ entry = &(it->second);
}
else
{
- entry = new DictEntry(group, element, vr, fourth, name);
- VirtualEntry[tag] = entry;
+ DictEntry ent(group, element, vr, vm, name);
+ VirtualEntry.insert(
+ std::map<TagKey, DictEntry>::value_type
+ (tag, ent));
+ entry = &(VirtualEntry.find(tag)->second);
}
return entry;
{
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;
- return true; //FIXME
+ return true;
}
//-----------------------------------------------------------------------------