Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2004/10/08 04:43:38 $
- Version: $Revision: 1.44 $
+ Date: $Date: 2004/10/12 04:35:45 $
+ Version: $Revision: 1.45 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
#include <iostream>
#include <iomanip>
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
* \brief Construtor
* @param filename from which to build the dictionary.
*/
-gdcmDict::gdcmDict(std::string const & filename)
+Dict::Dict(std::string const & filename)
{
uint16_t group;
uint16_t element;
TagName name;
std::ifstream from( filename.c_str() );
- dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary",
+ dbg.Error(!from, "Dict::Dict: can't open dictionary",
filename.c_str());
while (!from.eof())
from >> std::ws; // used to be eatwhite(from);
std::getline(from, name); /// MEMORY LEAK in std::getline<>
- gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
+ DictEntry * newEntry = new DictEntry(group, element,
vr, fourth, name);
AddNewEntry(newEntry);
}
/**
* \brief Destructor
*/
-gdcmDict::~gdcmDict()
+Dict::~Dict()
{
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
{
- gdcmDictEntry* entryToDelete = tag->second;
+ DictEntry* entryToDelete = tag->second;
if ( entryToDelete )
{
delete entryToDelete;
}
}
// Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
- // assume all the pointed gdcmDictEntries are already cleaned-up when
+ // assume all the pointed DictEntries are already cleaned-up when
// we cleaned KeyHt.
KeyHt.clear();
NameHt.clear();
* Entries will be sorted by tag i.e. the couple (group, element).
* @param os The output stream to be written to.
*/
-void gdcmDict::Print(std::ostream &os)
+void Dict::Print(std::ostream &os)
{
os << "Dict file name : " << Filename << std::endl;
PrintByKey(os);
* Entries will be sorted by tag i.e. the couple (group, element).
* @param os The output stream to be written to.
*/
-void gdcmDict::PrintByKey(std::ostream &os)
+void Dict::PrintByKey(std::ostream &os)
{
std::ostringstream s;
* unpredictable result
* @param os The output stream to be written to.
*/
-void gdcmDict::PrintByName(std::ostream& os)
+void Dict::PrintByName(std::ostream& os)
{
std::ostringstream s;
//-----------------------------------------------------------------------------
// Public
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \brief adds a new Dicom Dictionary Entry
* @param newEntry entry to add
* @return false if Dicom Element already exists
*/
-bool gdcmDict::AddNewEntry(gdcmDictEntry *newEntry)
+bool Dict::AddNewEntry(DictEntry *newEntry)
{
- gdcmTagKey key = newEntry->GetKey();
+ TagKey key = newEntry->GetKey();
if(KeyHt.count(key) == 1)
{
- dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
+ dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str());
return false;
}
else
}
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \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 gdcmDict::ReplaceEntry(gdcmDictEntry *newEntry)
+bool Dict::ReplaceEntry(DictEntry *newEntry)
{
- if ( RemoveEntry(newEntry->gdcmDictEntry::GetKey()) )
+ if ( RemoveEntry(newEntry->DictEntry::GetKey()) )
{
KeyHt[newEntry->GetKey()] = newEntry;
NameHt[newEntry->GetName()] = newEntry;
}
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \brief removes an already existing Dicom Dictionary Entry,
* identified by its Tag
* @param key (group|element)
* @return false if Dicom Dictionary Entry doesn't exist
*/
-bool gdcmDict::RemoveEntry(gdcmTagKey key)
+bool Dict::RemoveEntry(TagKey key)
{
if(KeyHt.count(key) == 1)
{
- gdcmDictEntry* entryToDelete = KeyHt.find(key)->second;
+ DictEntry* entryToDelete = KeyHt.find(key)->second;
if ( entryToDelete )
{
}
else
{
- dbg.Verbose(1, "gdcmDict::RemoveEntry unfound entry", key.c_str());
+ dbg.Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str());
return false;
}
}
* @param element Dicom element number of the Dicom Element
* @return false if Dicom Dictionary Entry doesn't exist
*/
-bool gdcmDict::RemoveEntry (uint16_t group, uint16_t element)
+bool Dict::RemoveEntry (uint16_t group, uint16_t element)
{
- return RemoveEntry(gdcmDictEntry::TranslateToKey(group, element));
+ return RemoveEntry(DictEntry::TranslateToKey(group, element));
}
/**
* the name MAY CHANGE between two versions !
* @return the corresponding dictionnary entry when existing, NULL otherwise
*/
-gdcmDictEntry* gdcmDict::GetDictEntryByName(TagName name)
+DictEntry* Dict::GetDictEntryByName(TagName name)
{
if ( !NameHt.count(name))
{
* @param element element of the entry to be found
* @return the corresponding dictionnary entry when existing, NULL otherwise
*/
-gdcmDictEntry* gdcmDict::GetDictEntryByNumber(uint16_t group, uint16_t element)
+DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element)
{
- gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element);
+ TagKey key = DictEntry::TranslateToKey(group, element);
if ( !KeyHt.count(key) )
{
return 0;
/**
* \brief Consider all the entries of the public dicom dictionnary.
* Build all list of all the tag names of all those entries.
- * \sa gdcmDictSet::GetPubDictTagNamesByCategory
+ * \sa DictSet::GetPubDictTagNamesByCategory
* @return A list of all entries of the public dicom dictionnary.
*/
-std::list<std::string>* gdcmDict::GetDictEntryNames()
+std::list<std::string>* Dict::GetDictEntryNames()
{
std::list<std::string> *result = new std::list<std::string>;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
}
/**
- * \ingroup gdcmDict
+ * \ingroup Dict
* \brief Consider all the entries of the public dicom dictionnary.
* Build an hashtable whose keys are the names of the groups
* (fourth field in each line of dictionary) and whose corresponding
* corresponding values are lists of all the dictionnary entries
* among that group.
*/
-std::map<std::string, std::list<std::string> > *gdcmDict::GetDictEntryNamesByCategory(void)
+std::map<std::string, std::list<std::string> > *Dict::GetDictEntryNamesByCategory(void)
{
std::map<std::string, std::list<std::string> > *result = new std::map<std::string, std::list<std::string> >;
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff