Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2004/06/20 18:08:47 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2004/08/01 02:39:09 $
+ Version: $Revision: 1.34 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \brief The Dictionnary Set obtained with this constructor simply
* contains the Default Public dictionnary.
*/
-gdcmDictSet::gdcmDictSet(void)
+gdcmDictSet::gdcmDictSet()
{
DictPath = BuildDictPath();
- std::string PubDictFile(DictPath);
- PubDictFile += PUB_DICT_FILENAME; /// MEMORY LEAK std::string::operator+=
- Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile);
+ std::string pubDictFile(DictPath);
+ pubDictFile += PUB_DICT_FILENAME;
+ Dicts[PUB_DICT_NAME] = new gdcmDict(pubDictFile);
}
/**
// Remove dictionnaries
for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag)
{
- gdcmDict *EntryToDelete = tag->second;
- if ( EntryToDelete )
- delete EntryToDelete;
- tag->second=NULL;
+ gdcmDict *entryToDelete = tag->second;
+ if ( entryToDelete )
+ {
+ delete entryToDelete;
+ }
+ tag->second = NULL;
}
Dicts.clear();
// Remove virtual dictionnary entries
std::map<std::string,gdcmDictEntry *>::iterator it;
- for(it=virtualEntry.begin(); it!=virtualEntry.end(); ++it)
+ for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it)
{
- gdcmDictEntry *Entry = it->second;
- if ( Entry )
- delete Entry;
- it->second=NULL;
+ gdcmDictEntry *entry = it->second;
+ if ( entry )
+ {
+ delete entry;
+ }
+ it->second = NULL;
}
}
* \sa gdcmDictSet::GetPubDictTagNamesByCategory
* @return A list of all entries of the public dicom dictionnary.
*/
-std::list<std::string> *gdcmDictSet::GetPubDictEntryNames(void)
+std::list<std::string> *gdcmDictSet::GetPubDictEntryNames()
{
- return(GetDefaultPubDict()->GetDictEntryNames());
+ return GetDefaultPubDict()->GetDictEntryNames();
}
/**
* corresponding values are lists of all the dictionnary entries
* among that group.
*/
-std::map<std::string, std::list<std::string> > *gdcmDictSet::GetPubDictEntryNamesByCategory(void)
+std::map<std::string, std::list<std::string> > *
+ gdcmDictSet::GetPubDictEntryNamesByCategory()
{
- return(GetDefaultPubDict()->GetDictEntryNamesByCategory());
+ return GetDefaultPubDict()->GetDictEntryNamesByCategory();
}
/**
* @param Name Symbolic name that be used as identifier of the newly
* created dictionary.
*/
-gdcmDict *gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name)
+gdcmDict *gdcmDictSet::LoadDictFromFile(std::string const & fileName,
+ DictKey const & name)
{
- gdcmDict *NewDict = new gdcmDict(FileName);
- AppendDict(NewDict,Name);
- return(NewDict);
+ gdcmDict *newDict = new gdcmDict(fileName);
+ AppendDict(newDict, name);
+
+ return newDict;
}
/**
* @param DictName The symbolic name of the searched dictionary.
* \result The retrieved dictionary.
*/
-gdcmDict *gdcmDictSet::GetDict(DictKey DictName)
+gdcmDict *gdcmDictSet::GetDict(DictKey const & dictName)
{
- DictSetHT::iterator dict = Dicts.find(DictName);
- if(dict!=Dicts.end())
+ DictSetHT::iterator dict = Dicts.find(dictName);
+ if(dict != Dicts.end())
+ {
return dict->second;
+ }
return NULL;
}
/**
- * \ingroup gdcmDictSet
* \brief Retrieve the default reference DICOM V3 public dictionary.
* \result The retrieved default dictionary.
*/
}
/**
- * \ingroup gdcmDictSet
* \brief Create a gdcmDictEntry which will be reference
* in no dictionnary
* @return virtual entry
*/
-gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(guint16 group, guint16 element,
- std::string vr,std::string fourth,
+gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(uint16_t group,
+ uint16_t element,
+ std::string vr,
+ std::string fourth,
std::string name)
{
- gdcmDictEntry *entry;
- std::string tag=gdcmDictEntry::TranslateToKey(group,element)+"#"+vr+"#"+fourth+"#"+name;
+ gdcmDictEntry* entry;
+ const std::string tag = gdcmDictEntry::TranslateToKey(group,element)
+ + "#" + vr + "#" + fourth + "#" + name;
std::map<std::string,gdcmDictEntry *>::iterator it;
- it=virtualEntry.find(tag);
- if(it!=virtualEntry.end())
+ it = VirtualEntry.find(tag);
+ if(it != VirtualEntry.end())
{
- entry=it->second;
+ entry = it->second;
}
else
{
- entry=new gdcmDictEntry(group,element,vr,fourth,name);
- virtualEntry[tag]=entry;
+ entry = new gdcmDictEntry(group, element, vr, fourth, name);
+ VirtualEntry[tag] = entry;
}
- return(entry);
+
+ return entry;
}
/**
- * \ingroup gdcmDictSet
* \brief Obtain from the GDCM_DICT_PATH environnement variable the
* path to directory containing the dictionnaries. When
* the environnement variable is absent the path is defaulted
* to "../Dicts/".
* @return path to directory containing the dictionnaries
*/
-std::string gdcmDictSet::BuildDictPath(void)
+std::string gdcmDictSet::BuildDictPath()
{
- std::string ResultPath;
- const char *EnvPath = (char*)0;
- EnvPath = getenv("GDCM_DICT_PATH");
- if (EnvPath && (strlen(EnvPath) != 0))
+ 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 += '/';
+ resultPath = envPath;
+ if ( resultPath[resultPath.length()-1] != '/' )
+ {
+ resultPath += '/';
+ }
dbg.Verbose(1, "gdcmDictSet::BuildDictPath:",
"Dictionary path set from environnement");
}
else
- ResultPath = PUB_DICT_PATH;
- return ResultPath;
+ {
+ resultPath = PUB_DICT_PATH;
+ }
+
+ return resultPath;
}
//-----------------------------------------------------------------------------
// Protected
-bool gdcmDictSet::AppendDict(gdcmDict *NewDict,DictKey Name)
+bool gdcmDictSet::AppendDict(gdcmDict *newDict, DictKey const & name)
{
- Dicts[Name] = NewDict;
- return(true);
+ Dicts[name] = newDict;
+
+ return true; //FIXME
}
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff