Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2005/02/01 10:29:55 $
- Version: $Revision: 1.57 $
+ Date: $Date: 2005/07/11 15:20:46 $
+ Version: $Revision: 1.67 $
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
+#include <stdio.h> // For sprintf
namespace gdcm
{
Dicts.clear();
// Remove virtual dictionary entries
- VirtualEntry.clear();
+ VirtualEntries.clear();
}
//-----------------------------------------------------------------------------
* @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);
AppendDict(newDict, name);
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
+ * \brief Create a DictEntry which will be referenced in no dictionary
+ * @param group Group number of the Entry
+ * @param elem Element number of the Entry
+ * @param vr Value Representation of the Entry
+ * @param vm Value Multiplicity of the Entry
+ * @param name English name of the Entry
* @return virtual entry
*/
DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
- uint16_t element,
+ uint16_t elem,
TagName vr,
TagName vm,
TagName name)
{
DictEntry *entry;
- const std::string tag = DictEntry::TranslateToKey(group,element)
- + "#" + vr + "#" + vm + "#" + name;
+
+ // Let's follow 'Purify' advice
+ //
+ // const std::string tag = DictEntry::TranslateToKey(group,elem)
+ // + "#" + vr + "#" + vm + "#" + name;
+#if FASTTAGKEY
+ // FIXME
+ TagKey tag;
+ tag.tab[0] = group;
+ tag.tab[1] = elem;
+#else
+ char res[10];
+ sprintf(res,"%04x|%04x", group, elem);
+ TagKey tag = res;
+ tag += "#" + vr + "#" + vm + "#" + name;
+#endif
+
TagKeyHT::iterator it;
- it = VirtualEntry.find(tag);
- if(it != VirtualEntry.end())
+ it = VirtualEntries.find(tag);
+ if ( it != VirtualEntries.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);
+ DictEntry ent(group, elem, vr, vm, name);
+ VirtualEntries.insert(
+ std::map<TagKey, DictEntry>::value_type(tag, ent) );
+ entry = &(VirtualEntries.find(tag)->second);
}
return entry;
}
-/**
- * \brief Obtain from the GDCM_DICT_PATH environnement variable the
- * path to directory containing the dictionaries. When
- * the environnement variable is absent the path is defaulted
- * to "../Dicts/".
- * @return path to directory containing the dictionaries
- */
-std::string DictSet::BuildDictPath()
-{
- std::string resultPath;
- const char *envPath = 0;
- envPath = getenv("GDCM_DICT_PATH");
-
- if (envPath && (strlen(envPath) != 0))
- {
- resultPath = envPath;
- if ( resultPath[resultPath.length()-1] != '/' )
- {
- resultPath += '/';
- }
- gdcmVerboseMacro( "Dictionary path set from environnement");
- }
- else
- {
- resultPath = PUB_DICT_PATH;
- }
-
- return resultPath;
-}
-
/**
* \brief Get the first entry while visiting the DictSet
* \return The first Dict if found, otherwhise NULL
Dict *DictSet::GetFirstEntry()
{
ItDictHt = Dicts.begin();
- if( ItDictHt != Dicts.end() )
+ if ( ItDictHt != Dicts.end() )
return ItDictHt->second;
return NULL;
}
return NULL;
}
+/**
+ * \brief Obtain from the GDCM_DICT_PATH environnement variable the
+ * path to directory containing the dictionaries. When
+ * the environnement variable is absent the path is defaulted
+ * to "../Dicts/".
+ * @return path to directory containing the dictionaries
+ */
+std::string DictSet::BuildDictPath()
+{
+ std::string resultPath;
+ const char *envPath;
+ envPath = getenv("GDCM_DICT_PATH");
+
+ if (envPath && (strlen(envPath) != 0))
+ {
+ resultPath = envPath;
+ gdcmWarningMacro( "Dictionary path set from environnement");
+ }
+ else
+ {
+ resultPath = PUB_DICT_PATH;
+ }
+ if ( resultPath[resultPath.length()-1] != '/' )
+ {
+ resultPath += '/';
+ }
+
+ return resultPath;
+}
+
//-----------------------------------------------------------------------------
// Protected
/**