Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2004/09/03 14:04:02 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2005/01/06 20:03:27 $
+ Version: $Revision: 1.36 $
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)
+ for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
{
- gdcmDocEntry* entryToDelete = cc->second;
- if ( entryToDelete )
+ if ( cc->second )
{
- delete entryToDelete;
+ delete cc->second;
}
}
TagHT.clear();
}
-
-//-----------------------------------------------------------------------------
-// Public
-
-
//-----------------------------------------------------------------------------
// Print
/**
* 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->SetPrintLevel(PrintLevel);
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;
}
}
+//-----------------------------------------------------------------------------
+// Public
/**
* \brief Writes the Header Entries (Dicom Elements)
* from the H Table
* @return
*/
-void gdcmElementSet::Write(FILE *fp, FileType filetype)
+void ElementSet::WriteContent(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);
+ i->second->WriteContent(fp, filetype);
}
}
-//-----------------------------------------------------------------------------
-// Protected
//-----------------------------------------------------------------------------
+// Protected
//-----------------------------------------------------------------------------
// Private
* \brief add a new Dicom Element pointer to the H Table
* @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);
- }
- else
+ 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 BUT keep the entry.
- * @param entryToRemove Entry to remove.
+ * \brief Clear the hash table from given entry AND delete the entry.
+ * @param entryToRemove Entry to remove AND delete.
+ * \warning Some problems when using under Windows... prefer the use of
+ * Initialize / GetNext methods
*/
-bool gdcmElementSet::RemoveEntryNoDestroy( 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 ;
}
/**
- * \brief Clear the hash table from given entry AND delete the entry.
- * @param entryToRemove Entry to remove AND delete.
+ * \brief Clear the hash table from given entry BUT keep the entry.
+ * @param entryToRemove Entry to remove.
*/
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
+bool ElementSet::RemoveEntryNoDestroy(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.");
- delete entryToRemove;
+ dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
return true;
}
- dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
+ dbg.Verbose(0, "ElementSet::RemoveEntry: key not present");
return false ;
}
+
+/**
+ * \brief Initialise the visit of the Hash table (TagHT)
+ */
+void ElementSet::Initialize()
+{
+ ItTagHT = TagHT.begin();
+}
+
+/**
+ * \brief Get the next entry whil visiting the Hash table (TagHT)
+ * \return The next DocEntry if found, otherwhise NULL
+ */
+DocEntry *ElementSet::GetNextEntry()
+{
+ if (ItTagHT != TagHT.end())
+ {
+ DocEntry *tmp = ItTagHT->second;
+ ++ItTagHT;
+
+ return(tmp);
+ }
+ else
+ {
+ return(NULL);
+ }
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff