X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=2ec7540d0a693640567e4c08386c01163787aaa8;hb=957dcd905e535fcfe37185ca5ea08a801e3078d3;hp=c4af8e33be42709c3053d26ac523e548161f133c;hpb=7a822ba5bef24e1f37e5ffa15d9c9fbaeb66cffa;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index c4af8e33..2ec7540d 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2005/02/04 23:49:23 $ - Version: $Revision: 1.68 $ + Date: $Date: 2005/02/07 08:48:18 $ + Version: $Revision: 1.70 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -150,12 +150,12 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove ) if( *it == entryToRemove ) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() ); + gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() ); delete entryToRemove; return true; } } - gdcmVerboseMacro( "Entry not found: " << entryToRemove->GetKey() ); + gdcmWarningMacro( "Entry not found: " << entryToRemove->GetKey() ); return false ; } @@ -173,13 +173,13 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove) if( *it == entryToRemove ) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased, no destroyed: " + gdcmWarningMacro( "One element erased, no destroyed: " << entryToRemove->GetKey() ); return true; } } - gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() ); + gdcmWarningMacro( "Entry not found:" << entryToRemove->GetKey() ); return false ; } @@ -221,42 +221,6 @@ DocEntry *SQItem::GetNextEntry() return NULL; } -/** - * \brief Get the first ValEntry while visiting theSQItem - * This method is designed for Python users - * \return The first ValEntry if found, otherwhise NULL - */ -ValEntry *SQItem::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 - ItValEntries = ItDocEntries; - if ( (valEntry = dynamic_cast(d))) - return valEntry; - return GetNextValEntry(); -} - -/** - * \brief Get the next ValEntry while visiting the SQItem - * \return The next ValEntry if found, otherwhise NULL - */ -ValEntry *SQItem::GetNextValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = *ItValEntries; - ++ItValEntries; - while( d ) - { - if ( (valEntry = dynamic_cast(d))) - return valEntry; - else - return GetNextValEntry(); - } - return 0; -} - /** * \brief Gets a Dicom Element inside a SQ Item Entry * @param group Group number of the Entry