Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2004/07/19 03:34:12 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2004/11/16 02:54:35 $
+ Version: $Revision: 1.27 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
#include "gdcmBinEntry.h"
#include "gdcmSeqEntry.h"
+namespace gdcm
+{
+
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup gdcmElementSet
- * \brief Constructor from a given gdcmElementSet
+ * \ingroup ElementSet
+ * \brief Constructor from a given ElementSet
*/
-gdcmElementSet::gdcmElementSet(int depthLevel)
- : gdcmDocEntrySet(depthLevel)
+//BOZ depthLevel is not usefull anymore
+ElementSet::ElementSet(int depthLevel)
+ : DocEntrySet()
{
+ (void)depthLevel;
}
/**
- * \ingroup gdcmElementSet
+ * \ingroup ElementSet
* \brief Canonical destructor.
*/
-gdcmElementSet::~gdcmElementSet()
+ElementSet::~ElementSet()
{
for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
{
- gdcmDocEntry* entryToDelete = cc->second;
+ DocEntry* entryToDelete = cc->second;
if ( entryToDelete )
{
delete entryToDelete;
* from the H Table
* @return
*/
-void gdcmElementSet::Print(std::ostream & os)
+void ElementSet::Print(std::ostream& os)
{
for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
- gdcmDocEntry* entry = i->second;
+ DocEntry* entry = i->second;
entry->Print(os);
- bool PrintEndLine = true;
- if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
- {
- (void)seqEntry; //not used
- PrintEndLine = false;
- }
- if( PrintEndLine )
+ if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
{
- os << std::endl;
+ (void)seqEntry;
+ // Avoid the newline for a sequence:
+ continue;
}
+ os << std::endl;
}
}
* from the H Table
* @return
*/
-void gdcmElementSet::Write(FILE *fp, FileType filetype)
+void ElementSet::Write(std::ofstream* fp, FileType filetype)
{
- for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
+ for (TagDocEntryHT::const_iterator i = TagHT.begin();
+ i != TagHT.end();
+ ++i)
{
i->second->Write(fp, filetype);
}
/**
* \brief add a new Dicom Element pointer to the H Table
- * @param NewEntry entry to add
+ * @param newEntry entry to add
*/
-bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
+bool ElementSet::AddEntry(DocEntry* newEntry)
{
- gdcmTagKey key = newEntry->GetKey();
+ const TagKey& key = newEntry->GetKey();
if( TagHT.count(key) == 1 )
{
- dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ",
+ dbg.Verbose(1, "ElementSet::AddEntry key already present: ",
key.c_str());
- return(false);
+ return false;
}
else
{
- TagHT[newEntry->GetKey()] = newEntry;
+ TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry));
return true;
}
}
/**
- * \brief Clear the hash table from given entry.
- * @param EntryToRemove Entry to remove.
+ * \brief Clear the hash table from given entry BUT keep the entry.
+ * @param entryToRemove Entry to remove.
+ */
+bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+{
+ const TagKey& key = entryToRemove->GetKey();
+ if( TagHT.count(key) == 1 )
+ {
+ TagHT.erase(key);
+ dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+ return true;
+ }
+
+ dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+ return false ;
+}
+
+/**
+ * \brief Clear the hash table from given entry AND delete the entry.
+ * @param entryToRemove Entry to remove AND delete.
*/
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
{
- gdcmTagKey key = entryToRemove->GetKey();
+ const TagKey& key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+ dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+ delete entryToRemove;
return true;
}
- dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
+ dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
return false ;
}
+} // end namespace gdcm