Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2004/06/20 18:08:47 $
- Version: $Revision: 1.35 $
+ Date: $Date: 2004/11/16 02:54:35 $
+ Version: $Revision: 1.52 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
#include <iostream>
#include <iomanip>
+namespace gdcm
+{
+void FillDefaultDataDict(Dict *d);
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
* \brief Construtor
- * @param FileName from which to build the dictionary.
+ * @param filename from which to build the dictionary.
*/
-gdcmDict::gdcmDict(std::string & FileName) {
- guint16 group, element;
- char buff[1024];
+Dict::Dict(std::string const & filename)
+{
+ uint16_t group;
+ uint16_t element;
TagName vr;
TagName fourth;
TagName name;
- std::ifstream from(FileName.c_str());
- dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary",
- FileName.c_str());
-
- while (!from.eof()) {
- from >> std::hex;
- from >> group; /// MEMORY LEAK in std::istream::operator>>
- from >> element;
- from >> vr;
- from >> fourth;
- eatwhite(from);
- getline(from, name); /// MEMORY LEAK in std::getline<>
+ std::ifstream from( filename.c_str() );
+ if( !from )
+ {
+ dbg.Verbose(2,"Dict::Dict: can't open dictionary", filename.c_str());
+ // Using default embeded one:
+ FillDefaultDataDict( this );
+ }
+ else
+ {
+ while (!from.eof())
+ {
+ from >> std::hex;
+ from >> group;
+ from >> element;
+ from >> vr;
+ from >> fourth;
+ from >> std::ws; //remove white space
+ std::getline(from, name);
+
+ const DictEntry newEntry(group, element, vr, fourth, name);
+ AddNewEntry(newEntry);
+ }
- gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
- vr, fourth, name);
- AddNewEntry(newEntry);
+ Filename = filename;
}
from.close();
-
- filename=FileName;
}
/**
* \brief Destructor
*/
-gdcmDict::~gdcmDict() {
- for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) {
- gdcmDictEntry* EntryToDelete = tag->second;
- if ( EntryToDelete )
- delete EntryToDelete;
- }
+Dict::~Dict()
+{
// Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
- // assume all the pointed gdcmDictEntries are already cleaned-up when
+ // assume all the pointed DictEntries are already cleaned-up when
// we cleaned KeyHt.
KeyHt.clear();
NameHt.clear();
* Entries will be sorted by tag i.e. the couple (group, element).
* @param os The output stream to be written to.
*/
-void gdcmDict::Print(std::ostream &os) {
- os<<"Dict file name : "<<filename<<std::endl;
+void Dict::Print(std::ostream &os)
+{
+ os << "Dict file name : " << Filename << std::endl;
PrintByKey(os);
}
* Entries will be sorted by tag i.e. the couple (group, element).
* @param os The output stream to be written to.
*/
-void gdcmDict::PrintByKey(std::ostream &os) {
+void Dict::PrintByKey(std::ostream &os)
+{
std::ostringstream s;
- for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
+ for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
+ {
s << "Entry : ";
- s << "(" << std::hex << std::setw(4) << tag->second->GetGroup() << ',';
- s << std::hex << std::setw(4) << tag->second->GetElement() << ") = " << std::dec;
- s << tag->second->GetVR() << ", ";
- s << tag->second->GetFourth() << ", ";
- s << tag->second->GetName() << "." << std::endl;
+ s << "(" << std::hex << std::setw(4) << tag->second.GetGroup() << ',';
+ s << std::hex << std::setw(4) << tag->second.GetElement() << ") = "
+ << std::dec;
+ s << tag->second.GetVR() << ", ";
+ s << tag->second.GetFourth() << ", ";
+ s << tag->second.GetName() << "." << std::endl;
}
os << s.str();
}
* unpredictable result
* @param os The output stream to be written to.
*/
-void gdcmDict::PrintByName(std::ostream& os) {
+void Dict::PrintByName(std::ostream& os)
+{
std::ostringstream s;
- for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag){
+ for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag)
+ {
s << "Entry : ";
- s << tag->second->GetName() << ",";
- s << tag->second->GetVR() << ", ";
- s << tag->second->GetFourth() << ", ";
- s << "(" << std::hex << std::setw(4) << tag->second->GetGroup() << ',';
- s << std::hex << std::setw(4) << tag->second->GetElement() << ") = ";
+ s << tag->second.GetName() << ",";
+ s << tag->second.GetVR() << ", ";
+ s << tag->second.GetFourth() << ", ";
+ s << "(" << std::hex << std::setw(4) << tag->second.GetGroup() << ',';
+ s << std::hex << std::setw(4) << tag->second.GetElement() << ") = ";
s << std::dec << std::endl;
}
os << s.str();
//-----------------------------------------------------------------------------
// Public
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \brief adds a new Dicom Dictionary Entry
- * @param NewEntry entry to add
+ * @param newEntry entry to add
* @return false if Dicom Element already exists
*/
-bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry)
+bool Dict::AddNewEntry(DictEntry const & newEntry)
{
- TagKey key;
- key = NewEntry->GetKey();
+ const TagKey & key = newEntry.GetKey();
if(KeyHt.count(key) == 1)
{
- dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
- return(false);
+ dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str());
+ return false;
}
else
{
- KeyHt[NewEntry->GetKey()] = NewEntry;
- NameHt[NewEntry->GetName()] = NewEntry; /// MEMORY LEAK in
- /// std::map<>::operator[]
- return(true);
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
+ NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
+ return true;
}
}
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \brief replaces an already existing Dicom Element by a new one
- * @param NewEntry new entry (overwrites any previous one with same tag)
+ * @param newEntry new entry (overwrites any previous one with same tag)
* @return false if Dicom Element doesn't exist
*/
-bool gdcmDict::ReplaceEntry(gdcmDictEntry *NewEntry) {
- if ( RemoveEntry(NewEntry->gdcmDictEntry::GetKey()) ) {
- KeyHt[NewEntry->GetKey()] = NewEntry;
- NameHt[NewEntry->GetName()] = NewEntry;
- return (true);
+bool Dict::ReplaceEntry(DictEntry const & newEntry)
+{
+ if ( RemoveEntry(newEntry.GetKey()) )
+ {
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
+ NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
+ return true;
}
- return (false);
+ return false;
}
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \brief removes an already existing Dicom Dictionary Entry,
* identified by its Tag
* @param key (group|element)
* @return false if Dicom Dictionary Entry doesn't exist
*/
-bool gdcmDict::RemoveEntry(TagKey key)
+bool Dict::RemoveEntry (TagKey const & key)
{
- if(KeyHt.count(key) == 1)
+ TagKeyHT::const_iterator it = KeyHt.find(key);
+ if(it != KeyHt.end())
{
- gdcmDictEntry* EntryToDelete = KeyHt.find(key)->second;
-
- if ( EntryToDelete )
- {
- NameHt.erase(EntryToDelete->GetName());
- delete EntryToDelete;
- }
-
+ const DictEntry& entryToDelete = it->second;
+ NameHt.erase(entryToDelete.GetName());
KeyHt.erase(key);
- return (true);
+
+ return true;
}
else
{
- dbg.Verbose(1, "gdcmDict::RemoveEntry unfound entry", key.c_str());
- return (false);
+ dbg.Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str());
+ return false;
}
}
/**
- * \ingroup gdcmDict
* \brief removes an already existing Dicom Dictionary Entry,
* identified by its group,element number
* @param group Dicom group number of the Dicom Element
* @param element Dicom element number of the Dicom Element
* @return false if Dicom Dictionary Entry doesn't exist
*/
-bool gdcmDict::RemoveEntry (guint16 group, guint16 element) {
- return( RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)) );
+bool Dict::RemoveEntry (uint16_t group, uint16_t element)
+{
+ return RemoveEntry(DictEntry::TranslateToKey(group, element));
}
/**
- * \ingroup gdcmDict
* \brief Get the dictionnary entry identified by it's name.
* @param name element of the ElVal to modify
* \warning : NEVER use it !
- * the 'name' IS NOT an identifier within the Dicom Dicom Dictionary
+ * the 'name' IS NOT an identifier within the Dicom Dictionary
* the name MAY CHANGE between two versions !
* @return the corresponding dictionnary entry when existing, NULL otherwise
*/
-gdcmDictEntry *gdcmDict::GetDictEntryByName(TagName name) {
- if ( ! NameHt.count(name))
- return NULL;
- return NameHt.find(name)->second;
+DictEntry* Dict::GetDictEntryByName(TagName const & name)
+{
+ TagNameHT::iterator it = NameHt.find(name);
+ if ( it == NameHt.end() )
+ {
+ return 0;
+ }
+ return &(it->second);
}
/**
- * \ingroup gdcmDict
* \brief Get the dictionnary entry identified by a given tag (group,element)
* @param group group of the entry to be found
* @param element element of the entry to be found
* @return the corresponding dictionnary entry when existing, NULL otherwise
*/
-gdcmDictEntry *gdcmDict::GetDictEntryByNumber(guint16 group, guint16 element) {
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! KeyHt.count(key))
- return NULL;
- return KeyHt.find(key)->second;
+DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element)
+{
+ TagKey key = DictEntry::TranslateToKey(group, element);
+ TagKeyHT::iterator it = KeyHt.find(key);
+ if ( it == KeyHt.end() )
+ {
+ return 0;
+ }
+ return &(it->second);
}
/**
- * \ingroup gdcmDict
* \brief Consider all the entries of the public dicom dictionnary.
* Build all list of all the tag names of all those entries.
- * \sa gdcmDictSet::GetPubDictTagNamesByCategory
+ * \sa DictSet::GetPubDictTagNamesByCategory
* @return A list of all entries of the public dicom dictionnary.
*/
-std::list<std::string> *gdcmDict::GetDictEntryNames(void)
+EntryNamesList* Dict::GetDictEntryNames()
{
- std::list<std::string> *Result = new std::list<std::string>;
+ EntryNamesList *result = new EntryNamesList;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
{
- Result->push_back( tag->second->GetName() );
+ result->push_back( tag->second.GetName() );
}
- return Result;
+ return result;
}
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \brief Consider all the entries of the public dicom dictionnary.
* Build an hashtable whose keys are the names of the groups
* (fourth field in each line of dictionary) and whose corresponding
* corresponding values are lists of all the dictionnary entries
* among that group.
*/
-std::map<std::string, std::list<std::string> > *gdcmDict::GetDictEntryNamesByCategory(void)
+EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory()
{
- std::map<std::string, std::list<std::string> > *Result = new std::map<std::string, std::list<std::string> >;
+ EntryNamesByCatMap *result = new EntryNamesByCatMap;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
{
- (*Result)[tag->second->GetFourth()].push_back(tag->second->GetName());
+ (*result)[tag->second.GetFourth()].push_back(tag->second.GetName());
}
- return Result;
+
+ return result;
}
//-----------------------------------------------------------------------------
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm