Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2004/12/16 13:46:37 $
- Version: $Revision: 1.35 $
+ Date: $Date: 2005/01/25 15:44:24 $
+ Version: $Revision: 1.51 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup ElementSet
- * \brief Constructor from a given ElementSet
+ * \brief Constructor for a given ElementSet
*/
//BOZ depthLevel is not usefull anymore
ElementSet::ElementSet(int depthLevel)
}
/**
- * \ingroup ElementSet
* \brief Canonical destructor.
*/
ElementSet::~ElementSet()
{
- for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
- {
- if ( cc->second )
- {
- delete cc->second;
- }
- }
- TagHT.clear();
+ ClearEntry();
}
//-----------------------------------------------------------------------------
// Print
/**
- * \brief Prints the Header Entries (Dicom Elements)
- * from the H Table
- * @return
+ * \brief Prints the Header Entries (Dicom Elements) from the H Table
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
*/
-void ElementSet::Print(std::ostream& os)
+void ElementSet::Print(std::ostream &os, std::string const & )
{
for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
entry->SetPrintLevel(PrintLevel);
entry->Print(os);
- if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+ if ( dynamic_cast<SeqEntry*>(entry) )
{
- (void)seqEntry;
// Avoid the newline for a sequence:
continue;
}
/**
* \brief Writes the Header Entries (Dicom Elements)
* from the H Table
- * @return
+ * @param fp ofstream to write to
+ * @param filetype filetype
*/
-void ElementSet::WriteContent(std::ofstream* fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
{
for (TagDocEntryHT::const_iterator i = TagHT.begin();
i != TagHT.end();
}
}
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
+/**
+ * \brief delete all entries in the ElementSet
+ */
+void ElementSet::ClearEntry()
+{
+ for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+ {
+ if ( cc->second )
+ {
+ delete cc->second;
+ }
+ }
+ TagHT.clear();
+}
/**
* \brief add a new Dicom Element pointer to the H Table
* @param newEntry entry to add
*/
-bool ElementSet::AddEntry(DocEntry* newEntry)
+bool ElementSet::AddEntry(DocEntry *newEntry)
{
- const TagKey& key = newEntry->GetKey();
+ const TagKey &key = newEntry->GetKey();
if( TagHT.count(key) == 1 )
{
- dbg.Verbose(1, "ElementSet::AddEntry key already present: ",
- key.c_str());
+ gdcmVerboseMacro( "Key already present: " << key.c_str());
return false;
}
else
/**
* \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 ElementSet::RemoveEntry( DocEntry* entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
{
- const TagKey& key = entryToRemove->GetKey();
+ const TagKey &key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+ //gdcmVerboseMacro( "One element erased.");
delete entryToRemove;
return true;
}
- dbg.Verbose(0, "ElementSet::RemoveEntry: key not present");
+ gdcmVerboseMacro( "Key not present");
return false ;
}
* \brief Clear the hash table from given entry BUT keep the entry.
* @param entryToRemove Entry to remove.
*/
-bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
{
- const TagKey& key = entryToRemove->GetKey();
+ const TagKey &key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+ //gdcmVerboseMacro( "One element erased.");
return true;
}
- dbg.Verbose(0, "ElementSet::RemoveEntry: key not present");
+ gdcmVerboseMacro( "Key not present");
return false ;
}
/**
- * \brief Initialise the visit of the Hash table (TagHT)
+ * \brief Get the first entry while visiting the DocEntrySet
+ * \return The first DocEntry if found, otherwhise NULL
*/
-void ElementSet::Initialize()
+DocEntry *ElementSet::GetFirstEntry()
{
ItTagHT = TagHT.begin();
+ if (ItTagHT != TagHT.end())
+ return ItTagHT->second;
+ return NULL;
}
/**
- * \brief Get the next entry whil visiting the Hash table (TagHT)
+ * \brief Get the next entry while visiting the Hash table (TagHT)
+ * \note : meaningfull only if GetFirstEntry already called
* \return The next DocEntry if found, otherwhise NULL
*/
DocEntry *ElementSet::GetNextEntry()
{
+ gdcmAssertMacro (ItTagHT != TagHT.end());
+
+ ++ItTagHT;
if (ItTagHT != TagHT.end())
- {
- DocEntry *tmp = ItTagHT->second;
- ++ItTagHT;
+ return ItTagHT->second;
+ return NULL;
+}
- return(tmp);
- }
- else
- {
- return(NULL);
- }
+/**
+ * \brief retrieves a Dicom Element using (group, element)
+ * @param group Group number of the searched Dicom Element
+ * @param elem Element number of the searched Dicom Element
+ * @return
+ */
+DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem)
+{
+ TagKey key = DictEntry::TranslateToKey(group, elem);
+ TagDocEntryHT::iterator it = TagHT.find(key);
+
+ if ( it!=TagHT.end() )
+ return it->second;
+ return NULL;
}
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
//-----------------------------------------------------------------------------
} // end namespace gdcm