Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2005/02/05 01:37:08 $
- Version: $Revision: 1.56 $
+ 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;
}
{
const TagKey &key = newEntry->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
- gdcmWarningMacro( "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);
//gdcmWarningMacro( "One element erased.");
return true;
}
- gdcmWarningMacro( "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);
//gdcmWarningMacro( "One element erased.");
return true;
}
- gdcmWarningMacro( "Key not present");
+ gdcmWarningMacro( "Key not present " << key);
return false ;
}
return NULL;
}
-/**
- * \brief Get the first ValEntry while visiting *the* 'zero level' DocEntrySet
- * (DocEntries out of any Sequence)
- * This method is designed for Python users
- * \return The first ValEntry if found, otherwhise NULL
- */
-ValEntry *ElementSet::GetFirstValEntry()
-{
- gdcm::ValEntry *valEntry;
- gdcm::DocEntry *d = GetFirstEntry();
- // an other iterator is needed to allow user iterate
- // at the same time both on DocEntries and ValEntries
- ItValEntryTagHT = ItTagHT;
- if ( (valEntry = dynamic_cast<gdcm::ValEntry*>(d)))
- return valEntry;
- return GetNextValEntry();
-}
-
-/**
- * \brief Get the next ValEntry while visiting *the* 'zero level' DocEntrySet
- * (DocEntries out of any Sequence)
- * \note : meaningfull only if GetFirstValEntry already called
- * \return The next ValEntry if found, otherwhise NULL
- */
-ValEntry *ElementSet::GetNextValEntry()
-{
- gdcm::ValEntry *valEntry;
- gdcm::DocEntry *d = ItValEntryTagHT->second;
- ++ItValEntryTagHT;
- while( d )
- {
- if ( (valEntry = dynamic_cast<gdcm::ValEntry*>(d)))
- return valEntry;
- else
- return GetNextValEntry();
- }
- return 0;
-}
-
/**
* \brief retrieves a Dicom Element using (group, element)
* @param group Group number of the searched Dicom Element
{
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);