Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2005/02/02 15:07:41 $
- Version: $Revision: 1.72 $
+ Date: $Date: 2005/09/02 07:00:04 $
+ Version: $Revision: 1.79 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
namespace gdcm
{
//-----------------------------------------------------------------------------
+/// \brief auto generated function, to fill up the Dicom Dictionnary,
+/// if relevant file is not found on user's disk
void FillDefaultDataDict(Dict *d);
//-----------------------------------------------------------------------------
*/
Dict::Dict(std::string const &filename)
{
- uint16_t group;
- uint16_t element;
- TagName vr;
- TagName vm;
- TagName name;
std::ifstream from( filename.c_str() );
- if( !from )
+ if ( !from )
{
- gdcmVerboseMacro( "Can't open dictionary" << filename.c_str());
+ gdcmWarningMacro( "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 >> vm;
- from >> std::ws; //remove white space
- std::getline(from, name);
-
- const DictEntry newEntry(group, element, vr, vm, name);
- AddEntry(newEntry);
- }
-
+ DoTheLoadingJob(from);
Filename = filename;
- from.close();
}
}
//-----------------------------------------------------------------------------
// Public
+
+/**
+ * \brief Add a all the entries held in a source dictionary
+ * \note it concerns only Private Dictionnary
+ * @param filename from which to build the dictionary.
+ */
+bool Dict::AddDict(std::string const &filename)
+{
+
+ std::ifstream from( filename.c_str() );
+ if ( !from )
+ {
+ gdcmWarningMacro( "Can't open dictionary" << filename.c_str());
+ return false;
+ }
+ else
+ {
+ DoTheLoadingJob(from);
+ return true;
+ }
+}
+
+
+/**
+ * \brief Removes from the current Dicom Dict all the entries held in a source dictionary
+ * \note it concerns only Private Dictionnary
+ * @param filename from which we read the entries to remove.
+ */
+bool Dict::RemoveDict(std::string const &filename)
+{
+ std::ifstream from( filename.c_str() );
+ if ( !from )
+ {
+ gdcmWarningMacro( "Can't open dictionary" << filename.c_str());
+ return false;
+ }
+ else
+ {
+ uint16_t group;
+ uint16_t elem;
+ TagName vr;
+ TagName vm;
+ TagName name;
+
+ while (!from.eof() && from)
+ {
+ from >> std::hex;
+ from >> group;
+ from >> elem;
+ from >> vr;
+ from >> vm;
+ // from >> std::ws; //remove white space
+ std::getline(from, name);
+
+ RemoveEntry(DictEntry::TranslateToKey(group, elem));
+ }
+ from.close();
+ return true;
+ }
+}
+
/**
* \brief adds a new Dicom Dictionary Entry
* @param newEntry entry to add
{
const TagKey &key = newEntry.GetKey();
- if(KeyHt.count(key) == 1)
+ if ( KeyHt.count(key) == 1 )
{
- gdcmVerboseMacro( "Already present" << key.c_str());
+ gdcmErrorMacro( "Already present:" << key );
return false;
}
else
bool Dict::RemoveEntry(TagKey const &key)
{
TagKeyHT::const_iterator it = KeyHt.find(key);
- if(it != KeyHt.end())
+ if ( it != KeyHt.end() )
{
KeyHt.erase(key);
}
else
{
- gdcmVerboseMacro( "Unfound entry" << key.c_str());
+ gdcmWarningMacro( "Unfound entry" << key );
return false;
}
}
}
/**
- * \brief Get the dictionary entry identified by a given tag (group,element)
- * @param group group of the entry to be found
- * @param elem element of the entry to be found
+ * \brief Get the dictionary entry identified by a given tag ("group|element")
+ * @param key tag of the entry to be found
* @return the corresponding dictionary entry when existing, NULL otherwise
*/
+DictEntry *Dict::GetEntry(TagKey const &key)
+{
+ TagKeyHT::iterator it = KeyHt.find(key);
+ if ( it == KeyHt.end() )
+ {
+ return 0;
+ }
+ return &(it->second);
+}
+
DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem)
{
TagKey key = DictEntry::TranslateToKey(group, elem);
DictEntry *Dict::GetFirstEntry()
{
ItKeyHt = KeyHt.begin();
- if( ItKeyHt != KeyHt.end() )
+ if ( ItKeyHt != KeyHt.end() )
return &(ItKeyHt->second);
return NULL;
}
//-----------------------------------------------------------------------------
// Private
+/**
+ * \brief Add all the dictionary entries from an already open source file
+ * @param from input stream to read from.
+ */
+void Dict::DoTheLoadingJob(std::ifstream &from)
+{
+ uint16_t group;
+ uint16_t elem;
+ TagName vr;
+ TagName vm;
+ TagName name;
+ while (!from.eof() && from)
+ {
+ from >> std::hex;
+ from >> group;
+ from >> elem;
+ from >> vr;
+ from >> vm;
+ from >> std::ws; //remove white space
+ std::getline(from, name);
+
+ const DictEntry newEntry(group, elem, vr, vm, name);
+ AddEntry(newEntry);
+ }
+ from.close();
+}
//-----------------------------------------------------------------------------
// Print
/**