Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2005/01/18 11:39:59 $
- Version: $Revision: 1.67 $
+ Date: $Date: 2005/02/01 10:29:55 $
+ Version: $Revision: 1.71 $
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
/**
std::getline(from, name);
const DictEntry newEntry(group, element, vr, vm, name);
- AddNewEntry(newEntry);
+ AddEntry(newEntry);
}
Filename = filename;
ClearEntry();
}
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \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::Print(std::ostream &os, std::string const & )
-{
- os << "Dict file name : " << Filename << std::endl;
- std::ostringstream s;
-
- 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.GetVM() << ", ";
- s << tag->second.GetName() << "." << 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::AddEntry(DictEntry const &newEntry)
{
const TagKey &key = newEntry.GetKey();
* @param elem element of the entry to be found
* @return the corresponding dictionary entry when existing, NULL otherwise
*/
-DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem)
+DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem)
{
TagKey key = DictEntry::TranslateToKey(group, elem);
TagKeyHT::iterator it = KeyHt.find(key);
return &(it->second);
}
-/**
- * \brief Consider all the entries of the public dicom dictionary.
- * Build all list of all the tag names of all those entries.
- * \sa DictSet::GetPubDictTagNamesByCategory
- * @return A list of all entries of the public dicom dictionary.
- */
-
-
- // 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;
-//}
-
-/**
- * \brief Consider all the entries of the public dicom dictionary.
- * Build an hashtable whose keys are the names of the groups
- * (fourth field in each line of dictionary) and whose corresponding
- * values are lists of all the dictionary entries among that
- * group. Note that apparently the Dicom standard doesn't explicitely
- * define a name (as a string) for each group.
- * A typical usage of this method would be to enable a dynamic
- * configuration of a Dicom file browser: the admin/user can
- * select in the interface which Dicom tags should be displayed.
- * \warning Dicom *doesn't* define any name for any 'categorie'
- * (the dictionary fourth field was formerly NIH defined
- * - and no longer he is-
- * and will be removed when Dicom provides us a text file
- * with the 'official' Dictionary, that would be more friendly
- * than asking us to perform a line by line check of the dictionary
- * at the beginning of each year to -try to- guess the changes)
- * Therefore : please NEVER use that fourth field :-(
- *
- * @return An hashtable: whose keys are the names of the groups and whose
- * corresponding values are lists of all the dictionary entries
- * among that group.
- */
-
- // 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;
-//}
-
/**
* \brief Get the first entry while visiting the Dict entries
* \return The first DicEntry if found, otherwhise NULL
// Private
//-----------------------------------------------------------------------------
+// Print
+/**
+ * \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.
+ * @param indent Indentation string to be prepended during printing
+ */
+void Dict::Print(std::ostream &os, std::string const & )
+{
+ os << "Dict file name : " << Filename << std::endl;
+ std::ostringstream s;
+ 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.GetVM() << ", ";
+ s << tag->second.GetName() << "." << std::endl;
+ }
+ os << s.str();
+}
+
+//-----------------------------------------------------------------------------
} // end namespace gdcm