Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 20:03:27 $
- Version: $Revision: 1.54 $
+ Date: $Date: 2005/01/08 15:03:59 $
+ Version: $Revision: 1.61 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
uint16_t group;
uint16_t element;
TagName vr;
- TagName fourth;
+ TagName vm;
TagName name;
std::ifstream from( filename.c_str() );
if( !from )
{
- dbg.Verbose(2,"Dict::Dict: can't open dictionary", filename.c_str());
+ gdcmVerboseMacro( "Can't open dictionary" << filename.c_str());
// Using default embeded one:
FillDefaultDataDict( this );
}
from >> group;
from >> element;
from >> vr;
- from >> fourth;
+ from >> vm;
from >> std::ws; //remove white space
std::getline(from, name);
- const DictEntry newEntry(group, element, vr, fourth, name);
+ const DictEntry newEntry(group, element, vr, vm, name);
AddNewEntry(newEntry);
}
*/
Dict::~Dict()
{
- // 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();
}
//-----------------------------------------------------------------------------
void Dict::Print(std::ostream &os)
{
os << "Dict file name : " << Filename << std::endl;
- PrintByKey(os);
-}
-
-/**
- * \brief Print all the dictionary entries contained in this dictionary.
- * Entries will be sorted by tag i.e. the couple (group, element).
- * @param os The output stream to be written to.
- */
-void Dict::PrintByKey(std::ostream &os)
-{
std::ostringstream s;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
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
if(KeyHt.count(key) == 1)
{
- dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str());
+ gdcmVerboseMacro( "Already present" << key.c_str());
return false;
}
else
{
KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
- NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
return true;
}
}
if ( RemoveEntry(newEntry.GetKey()) )
{
KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
- NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
return true;
}
return false;
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( "Unfound entry" << key.c_str());
return false;
}
}
return RemoveEntry(DictEntry::TranslateToKey(group, elem));
}
-/**
- * \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 Dictionary
- * the name MAY CHANGE between two versions !
- * @return the corresponding dictionnary entry when existing, NULL otherwise
- */
-DictEntry *Dict::GetDictEntryByName(TagName const &name)
-{
- TagNameHT::iterator it = NameHt.find(name);
- if ( it == NameHt.end() )
- {
- return 0;
- }
- return &(it->second);
-}
-
/**
* \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::GetDictEntry(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