Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2005/02/02 15:07:41 $
- Version: $Revision: 1.59 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.78 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDictSet.h"
#include "gdcmDebug.h"
+#include "gdcmGlobal.h"
#include <fstream>
#include <stdlib.h> // For getenv
+#include <stdio.h> // For sprintf
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
DictPath = BuildDictPath();
std::string pubDictFile(DictPath);
pubDictFile += PUB_DICT_FILENAME;
- Dicts[PUB_DICT_NAME] = new Dict(pubDictFile);
+ Dicts[PUB_DICT_NAME] = Dict::New(pubDictFile);
+ // Stored redundantly to avoid at access HTable DictSet every time.
+ Global::DefaultPubDict = Dicts[PUB_DICT_NAME];
}
/**
*/
DictSet::~DictSet()
{
+ Global::DefaultPubDict = 0; // just a pointer!
// Remove dictionaries
for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag)
{
- Dict *entryToDelete = tag->second;
- if ( entryToDelete )
- {
- delete entryToDelete;
- }
- tag->second = NULL;
+ if ( tag->second )
+ tag->second->Delete();
}
Dicts.clear();
-
- // Remove virtual dictionary entries
- VirtualEntry.clear();
}
//-----------------------------------------------------------------------------
Dict *DictSet::LoadDictFromFile(std::string const &filename,
DictKey const &name)
{
- Dict *newDict = new Dict(filename);
- AppendDict(newDict, name);
+ assert(Dicts.find(name)==Dicts.end());
+ ///\todo RemoveDict(name); when Dict already exist
+ Dict *newDict = Dict::New(filename);
+ Dicts[name] = newDict;
return newDict;
}
Dict *DictSet::GetDict(DictKey const &dictName)
{
DictSetHT::iterator dict = Dicts.find(dictName);
- if(dict != Dicts.end())
+ if ( dict != Dicts.end() )
{
return dict->second;
}
}
/**
- * \brief Create a DictEntry which will be referenced
- * in no dictionary
- * @return virtual entry
- */
-DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
- uint16_t element,
- TagName vr,
- TagName vm,
- TagName name)
-{
- DictEntry *entry;
- const std::string tag = DictEntry::TranslateToKey(group,element)
- + "#" + vr + "#" + vm + "#" + name;
- TagKeyHT::iterator it;
-
- it = VirtualEntry.find(tag);
- if(it != VirtualEntry.end())
- {
- entry = &(it->second);
- }
- else
- {
- DictEntry ent(group, element, vr, vm, name);
- VirtualEntry.insert(
- std::map<TagKey, DictEntry>::value_type
- (tag, ent));
- entry = &(VirtualEntry.find(tag)->second);
- }
-
- return entry;
-}
-
-/**
- * \brief Get the first entry while visiting the DictSet
+ * \brief Get the first dictionary while visiting the DictSet
* \return The first Dict if found, otherwhise NULL
*/
-Dict *DictSet::GetFirstEntry()
+Dict *DictSet::GetFirstDict()
{
ItDictHt = Dicts.begin();
- if( ItDictHt != Dicts.end() )
+ if ( ItDictHt != Dicts.end() )
return ItDictHt->second;
return NULL;
}
/**
- * \brief Get the next entry while visiting the Hash table (DictSetHT)
+ * \brief Get the next dictionary while visiting the Hash table (DictSetHT)
* \note : meaningfull only if GetFirstEntry already called
* \return The next Dict if found, otherwhise NULL
*/
-Dict *DictSet::GetNextEntry()
+Dict *DictSet::GetNextDict()
{
gdcmAssertMacro (ItDictHt != Dicts.end());
* to "../Dicts/".
* @return path to directory containing the dictionaries
*/
-std::string DictSet::BuildDictPath()
+std::string DictSet::BuildDictPath()
{
std::string resultPath;
- const char *envPath = 0;
- envPath = getenv("GDCM_DICT_PATH");
+ const char *envPath = getenv("GDCM_DICT_PATH");
- if (envPath && (strlen(envPath) != 0))
+ if (envPath && (strlen(envPath) != 0))
{
resultPath = envPath;
- if ( resultPath[resultPath.length()-1] != '/' )
- {
- resultPath += '/';
- }
- gdcmVerboseMacro( "Dictionary path set from environnement");
- }
+ gdcmStaticWarningMacro( "Dictionary path set from environnement");
+ }
else
{
resultPath = PUB_DICT_PATH;
}
-
+ if ( resultPath.length() && resultPath[resultPath.length()-1] != '/' )
+ {
+ resultPath += '/';
+ }
return resultPath;
}
//-----------------------------------------------------------------------------
// Protected
-/**
- * \brief Adds a Dictionary to a DictSet
- * \return always true
- */
-bool DictSet::AppendDict(Dict *newDict, DictKey const &name)
-{
- Dicts[name] = newDict;
-
- return true;
-}
//-----------------------------------------------------------------------------
// Private