X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSQItem.cxx;h=c0d3b27d2925525ab203f655f1cc6d431e07816e;hb=bd16605c78885c2c2bee82d88b3e2a7bd6707713;hp=e6b4e1c9cf145dd40fac7e17992e80063d91d2cd;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index e6b4e1c9..c0d3b27d 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/02 16:18:48 $ - Version: $Revision: 1.66 $ + Date: $Date: 2005/07/06 08:43:18 $ + Version: $Revision: 1.73 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -103,6 +103,7 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) * \brief Inserts *in the right place* any Entry (Dicom Element) * into the Sequence Item * @param entry Entry to add + * @return always true */ bool SQItem::AddEntry(DocEntry *entry) { @@ -147,15 +148,15 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove ) it != DocEntries.end(); ++it) { - if( *it == 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 ; } @@ -170,16 +171,16 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove) it != DocEntries.end(); ++it) { - if( *it == entryToRemove ) + if ( *it == entryToRemove ) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased, no destroyed: " + gdcmWarningMacro( "One element removed, no destroyed: " << entryToRemove->GetKey() ); return true; } } - gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() ); + gdcmWarningMacro( "Entry not found:" << entryToRemove->GetKey() ); return false ; } @@ -204,19 +205,19 @@ void SQItem::ClearEntry() DocEntry *SQItem::GetFirstEntry() { ItDocEntries = DocEntries.begin(); - if( ItDocEntries != DocEntries.end() ) + if ( ItDocEntries != DocEntries.end() ) return *ItDocEntries; return 0; } /** - * \brief Get the next Dicom entry while visiting the chained list + * \brief Get the next Dicom entry while visiting the SQItem * \return The next DocEntry if found, otherwhise NULL */ DocEntry *SQItem::GetNextEntry() { ++ItDocEntries; - if( ItDocEntries != DocEntries.end() ) + if ( ItDocEntries != DocEntries.end() ) return *ItDocEntries; return NULL; }