Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2004/08/31 14:24:47 $
- Version: $Revision: 1.17 $
+ Date: $Date: 2004/09/27 08:39:07 $
+ Version: $Revision: 1.23 $
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
* \ingroup gdcmElementSet
* \brief Constructor from a given gdcmElementSet
*/
+//BOZ depthLevel is not usefull anymore
gdcmElementSet::gdcmElementSet(int depthLevel)
- : gdcmDocEntrySet(depthLevel)
+ : gdcmDocEntrySet()
{
+ (void)depthLevel;
}
/**
* from the H Table
* @return
*/
-void gdcmElementSet::Print(std::ostream & os)
+void gdcmElementSet::Print(std::ostream& os)
{
for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
gdcmDocEntry* entry = i->second;
entry->Print(os);
- bool PrintEndLine = true;
if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
{
- (void)seqEntry; //not used
- PrintEndLine = false;
- }
- if( PrintEndLine )
- {
- 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 gdcmElementSet::Write(FILE* fp, FileType filetype)
{
for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
* \brief add a new Dicom Element pointer to the H Table
* @param newEntry entry to add
*/
-bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
+bool gdcmElementSet::AddEntry( gdcmDocEntry* newEntry)
{
gdcmTagKey key = newEntry->GetKey();
}
/**
- * \brief Clear the hash table from given entry.
+ * \brief Clear the hash table from given entry BUT keep the entry.
* @param entryToRemove Entry to remove.
*/
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
+bool gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry* entryToRemove)
+{
+ gdcmTagKey key = entryToRemove->GetKey();
+ if( TagHT.count(key) == 1 )
+ {
+ TagHT.erase(key);
+ dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+ return true;
+ }
+
+ dbg.Verbose(0, "gdcmElementSet::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)
{
gdcmTagKey key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+ delete entryToRemove;
return true;
}