Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2005/02/01 10:29:55 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2005/08/24 12:09:13 $
+ Version: $Revision: 1.63 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
//BOZ depthLevel is not usefull anymore
ElementSet::ElementSet(int depthLevel)
- : DocEntrySet()
+ : DocEntrySet()
{
(void)depthLevel;
}
}
}
-/**
- * \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
{
const TagKey &key = newEntry->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
- gdcmVerboseMacro( "Key already present: " << key.c_str());
+ gdcmWarningMacro( "Key already present: " << key );
return false;
}
else
bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
{
const TagKey &key = entryToRemove->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- //gdcmVerboseMacro( "One element erased.");
+ //gdcmWarningMacro( "One element erased.");
delete entryToRemove;
return true;
}
- gdcmVerboseMacro( "Key not present");
+ gdcmWarningMacro( "Key not present : " << key);
return false ;
}
bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
{
const TagKey &key = entryToRemove->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- //gdcmVerboseMacro( "One element erased.");
+ //gdcmWarningMacro( "One element erased.");
return true;
}
- gdcmVerboseMacro( "Key not present");
+ gdcmWarningMacro( "Key not present " << key);
return false ;
}
/**
- * \brief Get the first entry while visiting the DocEntrySet
+ * \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 Get the first entry while visiting *the* 'zero level' DocEntrySet
+ * (DocEntries out of any Sequence)
* \return The first DocEntry if found, otherwhise NULL
*/
DocEntry *ElementSet::GetFirstEntry()
}
/**
- * \brief Get the next entry while visiting the Hash table (TagHT)
+ * \brief Get the next entry while visiting *the* 'zero level' DocEntrySet
+ * (DocEntries out of any Sequence)
* \note : meaningfull only if GetFirstEntry already called
* \return The next DocEntry if found, otherwhise NULL
*/
{
for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
- DocEntry* entry = i->second;
+ DocEntry *entry = i->second;
entry->SetPrintLevel(PrintLevel);
entry->Print(os);