Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2004/10/27 22:31:12 $
- Version: $Revision: 1.48 $
+ Date: $Date: 2005/01/07 19:20:38 $
+ Version: $Revision: 1.59 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
namespace gdcm
{
-
+void FillDefaultDataDict(Dict *d);
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \brief Construtor
+ * \brief Constructor
* @param filename from which to build the dictionary.
*/
-Dict::Dict(std::string const & filename)
+Dict::Dict(std::string const &filename)
{
uint16_t group;
uint16_t element;
TagName vr;
- TagName fourth;
+ TagName vm;
TagName name;
std::ifstream from( filename.c_str() );
- dbg.Error(!from, "Dict::Dict: can't open dictionary",
- filename.c_str());
-
- while (!from.eof())
+ if( !from )
+ {
+ gdcmVerboseMacro("Dict::Dict: can't open dictionary" << filename.c_str());
+ // Using default embeded one:
+ FillDefaultDataDict( this );
+ }
+ else
{
- from >> std::hex;
- from >> group;
- from >> element;
- from >> vr;
- from >> fourth;
- from >> std::ws; //remove white space
- std::getline(from, name);
+ while (!from.eof())
+ {
+ from >> std::hex;
+ from >> group;
+ from >> element;
+ from >> vr;
+ from >> vm;
+ from >> std::ws; //remove white space
+ std::getline(from, name);
+
+ const DictEntry newEntry(group, element, vr, vm, name);
+ AddNewEntry(newEntry);
+ }
- DictEntry newEntry(group, element, vr, fourth, name);
- AddNewEntry(newEntry);
+ Filename = filename;
}
from.close();
-
- Filename = filename;
}
/**
*/
Dict::~Dict()
{
-/* for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
- {
- DictEntry* entryToDelete = tag->second;
- if ( entryToDelete )
- {
- delete entryToDelete;
- }
- }*/
- // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
- // assume all the pointed DictEntries are already cleaned-up when
- // we cleaned KeyHt.
+ // we assume all the pointed DictEntries are already cleaned-up
+ // when we clean KeyHt.
KeyHt.clear();
- NameHt.clear();
}
//-----------------------------------------------------------------------------
s << std::hex << std::setw(4) << tag->second.GetElement() << ") = "
<< std::dec;
s << tag->second.GetVR() << ", ";
- s << tag->second.GetFourth() << ", ";
+ s << tag->second.GetVM() << ", ";
s << tag->second.GetName() << "." << std::endl;
}
os << s.str();
}
-/**
- * \brief Print all the dictionary entries contained in this dictionary.
- * Entries will be sorted by the name of the dictionary entries.
- * \warning AVOID USING IT : the name IS NOT an identifier;
- * unpredictable result
- * @param os The output stream to be written to.
- */
-void Dict::PrintByName(std::ostream& os)
-{
- std::ostringstream s;
-
- 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 << std::dec << std::endl;
- }
- os << s.str();
-}
-
//-----------------------------------------------------------------------------
// Public
/**
* @param newEntry entry to add
* @return false if Dicom Element already exists
*/
-bool Dict::AddNewEntry(DictEntry const & newEntry)
+bool Dict::AddNewEntry(DictEntry const &newEntry)
{
- const TagKey & key = newEntry.GetKey();
+ const TagKey &key = newEntry.GetKey();
if(KeyHt.count(key) == 1)
{
- dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str());
+ gdcmVerboseMacro("Dict::AddNewEntry already present" << key.c_str());
return false;
}
else
{
- //KeyHt[newEntry.GetKey()] = newEntry;
- KeyHt.insert(
- TagKeyHT::value_type<TagKey, DictEntry>
- (newEntry.GetKey(), newEntry));
- //NameHt[newEntry.GetName()] = newEntry;
- NameHt.insert(
- TagNameHT::value_type<TagName, DictEntry>
- (newEntry.GetName(), newEntry ));
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
return true;
}
}
* @param newEntry new entry (overwrites any previous one with same tag)
* @return false if Dicom Element doesn't exist
*/
-bool Dict::ReplaceEntry(DictEntry const & newEntry)
+bool Dict::ReplaceEntry(DictEntry const &newEntry)
{
if ( RemoveEntry(newEntry.GetKey()) )
{
- //KeyHt[newEntry.GetKey()] = newEntry;
- KeyHt.insert(
- TagKeyHT::value_type<TagKey, DictEntry>
- (newEntry.GetKey(), newEntry));
- //NameHt[newEntry.GetName()] = newEntry;
- NameHt.insert(
- TagNameHT::value_type<TagName, DictEntry>
- (newEntry.GetName(), newEntry ));
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
return true;
}
return false;
* @param key (group|element)
* @return false if Dicom Dictionary Entry doesn't exist
*/
-bool Dict::RemoveEntry (TagKey const & key)
+bool Dict::RemoveEntry (TagKey const &key)
{
TagKeyHT::const_iterator it = KeyHt.find(key);
if(it != KeyHt.end())
{
- const DictEntry & entryToDelete = it->second;
- NameHt.erase(entryToDelete.GetName());
KeyHt.erase(key);
return true;
}
else
{
- dbg.Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str());
+ gdcmVerboseMacro("Dict::RemoveEntry unfound entry" << key.c_str());
return false;
}
}
* \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
+ * @param elem Dicom element number of the Dicom Element
* @return false if Dicom Dictionary Entry doesn't exist
*/
-bool Dict::RemoveEntry (uint16_t group, uint16_t element)
-{
- return RemoveEntry(DictEntry::TranslateToKey(group, element));
-}
-
-/**
- * \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 MAY CHANGE between two versions !
- * @return the corresponding dictionnary entry when existing, NULL otherwise
- */
-DictEntry* Dict::GetDictEntryByName(TagName const & name)
+bool Dict::RemoveEntry (uint16_t group, uint16_t elem)
{
- TagNameHT::iterator it = NameHt.find(name);
- if ( it == NameHt.end() )
- {
- return 0;
- }
- return &(it->second);
+ return RemoveEntry(DictEntry::TranslateToKey(group, elem));
}
/**
* \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
+ * @param elem element of the entry to be found
* @return the corresponding dictionnary entry when existing, NULL otherwise
*/
-DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element)
+DictEntry *Dict::GetDictEntryByNumber(uint16_t group, uint16_t elem)
{
- TagKey key = DictEntry::TranslateToKey(group, element);
+ TagKey key = DictEntry::TranslateToKey(group, elem);
TagKeyHT::iterator it = KeyHt.find(key);
if ( it == KeyHt.end() )
{
* \sa DictSet::GetPubDictTagNamesByCategory
* @return A list of all entries of the public dicom dictionnary.
*/
-EntryNamesList* Dict::GetDictEntryNames()
-{
- EntryNamesList *result = new EntryNamesList;
- for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
- {
- result->push_back( tag->second.GetName() );
- }
- return result;
-}
+
+
+ // Probabely useless
+
+
+//EntryNamesList *Dict::GetDictEntryNames()
+//{
+// EntryNamesList *result = new EntryNamesList;
+// for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
+// {
+// result->push_back( tag->second.GetName() );
+// }
+// return result;
+//}
/**
* \ingroup Dict
* corresponding values are lists of all the dictionnary entries
* among that group.
*/
-EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory()
-{
- EntryNamesByCatMap *result = new EntryNamesByCatMap;
-
- for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
- {
- (*result)[tag->second.GetFourth()].push_back(tag->second.GetName());
- }
-
- return result;
-}
+
+ // Probabely useless
+
+//EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory()
+//{
+// EntryNamesByCatMap *result = new EntryNamesByCatMap;
+//
+// for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
+// {
+// (*result)[tag->second.GetFourth()].push_back(tag->second.GetName());
+// }
+//
+// return result;
+//}
//-----------------------------------------------------------------------------
// Protected
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff