Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 12:58:27 $
- Version: $Revision: 1.80 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.87 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <iomanip>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generated function, to fill up the Dicom Dictionnary,
*/
Dict::Dict(std::string const &filename)
{
-
+ gdcmDebugMacro( "in Dict::Dict, filename =[" << filename << "]" );
std::ifstream from( filename.c_str() );
if ( !from )
{
FillDefaultDataDict( this );
}
else
- {
+ {
+ gdcmDebugMacro( "in Dict::Dict, DoTheLoadingJob filename =["
+ << filename << "]" );
DoTheLoadingJob(from);
Filename = filename;
}
// Public
/**
- * \brief Add a all the entries held in a source dictionary
+ * \brief Add 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 )
{
}
}
-
/**
* \brief Removes from the current Dicom Dict all the entries held in a source dictionary
* \note it concerns only Private Dictionnary
TagName vm;
TagName name;
- while (!from.eof() && from)
+ while ( true )
{
from >> std::hex;
from >> group;
+
+ if (from.eof())
+ break;
+
from >> elem;
from >> vr;
from >> vm;
// from >> std::ws; //remove white space
std::getline(from, name);
- RemoveEntry(DictEntry::TranslateToKey(group, elem));
+ RemoveEntry(group,elem);
}
from.close();
return true;
* @param newEntry entry to add
* @return false if Dicom Element already exists
*/
-bool Dict::AddEntry(DictEntry const &newEntry)
+bool Dict::AddEntry(DictEntry *newEntry)
{
- const TagKey &key = newEntry.GetKey();
+ const TagKey &key = newEntry->GetKey();
if ( KeyHt.count(key) == 1 )
{
}
else
{
- KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
+ newEntry->Register();
+ KeyHt.insert( TagKeyHT::value_type(key, newEntry));
return true;
}
}
-/**
- * \brief replaces an already existing Dicom Element by a new one
- * @param newEntry new entry (overwrites any previous one with same tag)
- * @return false if Dicom Element doesn't exist
+/*
+ * \ brief replaces an already existing Dicom Element by a new one
+ * @ 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)
+
+ /* seems to be useless
+
+bool Dict::ReplaceEntry(DictEntry *newEntry) // seems to be useless
{
- if ( RemoveEntry(newEntry.GetKey()) )
+ const TagKey &key = newEntry->GetKey();
+ if ( RemoveEntry(key) )
{
- KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
- return true;
+ newEntry->Register();
+ KeyHt.insert( TagKeyHT::value_type(key, newEntry));
+ return true;
}
return false;
}
+*/
/**
* \brief removes an already existing Dicom Dictionary Entry,
TagKeyHT::const_iterator it = KeyHt.find(key);
if ( it != KeyHt.end() )
{
- KeyHt.erase(key);
+ it->second->Unregister(); // delete the entry
+ KeyHt.erase(key); // remove pointer from HTable
return true;
}
{
// we assume all the pointed DictEntries are already cleaned-up
// when we clean KeyHt.
- KeyHt.clear();
+ TagKeyHT::const_iterator it;
+
+ for(it = KeyHt.begin();it!=KeyHt.end();++it)
+ it->second->Unregister(); // delete the entry
+ KeyHt.clear(); // remove all the entries from HTable
+
}
/**
* \brief Get the dictionary entry identified by a given tag ("group|element")
- * @param key tag of the entry to be found
+ * @param key tag of the searched entry
* @return the corresponding dictionary entry when existing, NULL otherwise
*/
DictEntry *Dict::GetEntry(TagKey const &key)
{
return 0;
}
- return &(it->second);
+ return it->second;
}
-
+/**
+ * \brief Get the dictionary entry identified by its "group" and "element")
+ * @param group Group number of the searched entry.
+ * @param elem Element number of the searched entry.
+ * @return the corresponding dictionary entry when existing, NULL otherwise
+ */
DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem)
{
TagKey key = DictEntry::TranslateToKey(group, elem);
{
return 0;
}
- return &(it->second);
+ return it->second;
}
/**
{
ItKeyHt = KeyHt.begin();
if ( ItKeyHt != KeyHt.end() )
- return &(ItKeyHt->second);
+ return ItKeyHt->second;
return NULL;
}
++ItKeyHt;
if (ItKeyHt != KeyHt.end())
- return &(ItKeyHt->second);
+ return ItKeyHt->second;
return NULL;
}
*/
void Dict::DoTheLoadingJob(std::ifstream &from)
{
+ if (!from)
+ return;
+
uint16_t group;
uint16_t elem;
VRKey vr;
TagName vm;
TagName name;
- while (!from.eof() && from)
+ DictEntry *newEntry;
+ while ( true )
{
from >> std::hex;
- from >> group;
+ from >> group;
from >> elem;
from >> vr;
from >> vm;
from >> std::ws; //remove white space
std::getline(from, name);
-
- DictEntry newEntry(group, elem, vr, vm, name);
+
+ if(from.eof()) {
+ break;
+ }
+
+ newEntry = DictEntry::New(group, elem, vr, vm, name);
AddEntry(newEntry);
+ newEntry->Delete();
}
from.close();
}
*/
void Dict::Print(std::ostream &os, std::string const & )
{
- os << "Dict file name : " << Filename << std::endl;
+ os << "Dict file name : [" << Filename << "]" << std::endl;
std::ostringstream s;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
- {
+ {
+std::cout << tag->second->GetKey() << " " << tag->second->GetName()
+ << std::endl;
s << "Entry : ";
- s << "(" << std::hex << std::setw(4) << tag->second.GetGroup() << ',';
- s << std::hex << std::setw(4) << tag->second.GetElement() << ") = "
+ s << "(" << tag->second->GetKey() << ") = "
<< std::dec;
- s << tag->second.GetVR() << ", ";
- s << tag->second.GetVM() << ", ";
- s << tag->second.GetName() << "." << std::endl;
+ s << tag->second->GetVR() << ", ";
+ s << tag->second->GetVM() << ", ";
+ s << tag->second->GetName() << "." << std::endl;
+
}
os << s.str();
+
}
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff