X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=f65828013b6d5119419c81140f37e9d7a0a76eca;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=f775d215aed10281da9eb3293b0b8ab084f7b307;hpb=963480c814326423065a4a02fa1bf8bc1243ae4f;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index f775d215..f6582801 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/01/18 11:39:59 $ - Version: $Revision: 1.105 $ + Date: $Date: 2005/02/01 13:00:16 $ + Version: $Revision: 1.125 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,6 +16,10 @@ =========================================================================*/ +//----------------------------------------------------------------------------- +// For full DICOMDIR description, see: +// PS 3.3-2003, pages 731-750 +//----------------------------------------------------------------------------- #include "gdcmDicomDir.h" #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" @@ -27,7 +31,7 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" #include "gdcmGlobal.h" -#include "gdcmHeader.h" +#include "gdcmFile.h" #include "gdcmSeqEntry.h" #include "gdcmSQItem.h" #include "gdcmValEntry.h" @@ -49,21 +53,16 @@ namespace gdcm { - -//----------------------------------------------------------------------------- -// For full DICOMDIR description, see: -// PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- // Constructor / Destructor - /** * \brief Constructor : creates an empty DicomDir */ DicomDir::DicomDir() :Document( ) -{ +{ Initialize(); // sets all private fields to NULL - MetaElems = NewMeta(); + NewMeta(); } /** @@ -89,7 +88,8 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): Initialize(); // sets all private fields to NULL // if user passed a root directory, sure we didn't get anything - if ( TagHT.begin() == TagHT.end() ) // when user passed a Directory to parse + + if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse { if (!parseDir) gdcmVerboseMacro( "Entry HT empty for file: "<SetPrintLevel(PrintLevel); - MetaElems->Print(os); - } - for(ListDicomDirPatient::iterator cc = Patients.begin(); - cc != Patients.end(); - ++cc) - { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); - } -} - //----------------------------------------------------------------------------- // Public /** * \brief This predicate, based on hopefully reasonable heuristics, - * decides whether or not the current header was properly parsed + * decides whether or not the current document was properly parsed * and contains the mandatory information for being considered as * a well formed and usable DicomDir. * @return true when Document is the one of a reasonable DicomDir, @@ -209,29 +183,6 @@ bool DicomDir::IsReadable() return true; } -/** - * \brief Sets all fields to NULL - */ - -void DicomDir::Initialize() -{ - StartMethod = NULL; - ProgressMethod = NULL; - EndMethod = NULL; - StartMethodArgDelete = NULL; - ProgressMethodArgDelete = NULL; - EndMethodArgDelete = NULL; - StartArg = NULL; - ProgressArg = NULL; - EndArg = NULL; - - Progress = 0.0; - Abort = false; - - MetaElems = NULL; -} - - /** * \brief fills the whole structure, starting from a root Directory */ @@ -336,6 +287,33 @@ void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) EndMethodArgDelete = method; } +/** + * \brief Get the first entry while visiting the DicomDirPatients + * \return The first DicomDirPatient if found, otherwhise NULL + */ +DicomDirPatient *DicomDir::GetFirstPatient() +{ + ItPatient = Patients.begin(); + if ( ItPatient != Patients.end() ) + return *ItPatient; + return NULL; +} + +/** + * \brief Get the next entry while visiting the DicomDirPatients + * \note : meaningfull only if GetFirstEntry already called + * \return The next DicomDirPatient if found, otherwhise NULL + */ +DicomDirPatient *DicomDir::GetNextPatient() +{ + gdcmAssertMacro (ItPatient != Patients.end()); + + ++ItPatient; + if ( ItPatient != Patients.end() ) + return *ItPatient; + return NULL; +} + /** * \brief writes on disc a DICOMDIR * \ warning does NOT add the missing elements in the header : @@ -366,7 +344,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) fp->write(filePreamble, 128); //FIXME binary_write( *fp, "DICM"); - DicomDirMeta *ptrMeta = GetDicomDirMeta(); + DicomDirMeta *ptrMeta = GetMeta(); ptrMeta->WriteContent(fp, ExplicitVR); // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta @@ -396,7 +374,6 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) //----------------------------------------------------------------------------- // Protected - /** * \brief create a Document-like chained list from a root Directory * @param path entry point of the tree-like structure @@ -407,7 +384,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) DirList dirList(path,1); // gets recursively the file list unsigned int count = 0; VectDocument list; - Header *header; + File *header; DirListType fileList = dirList.GetFilenames(); @@ -422,16 +399,16 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) break; } - header = new Header( it->c_str() ); + header = new File( it->c_str() ); if( !header ) { - gdcmVerboseMacro( "Failure in new Header " << it->c_str() ); + gdcmVerboseMacro( "Failure in new gdcm::File " << it->c_str() ); continue; } if( header->IsReadable() ) { - // Add the file header to the chained list: + // Add the file to the chained list: list.push_back(header); gdcmVerboseMacro( "Readable " << it->c_str() ); } @@ -445,7 +422,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan ); std::string tmp = dirList.GetDirName(); - //for each Header of the chained list, add/update the Patient/Study/Serie/Image info + //for each File of the chained list, add/update the Patient/Study/Serie/Image info SetElements(tmp, list); CallEndMethod(); @@ -453,71 +430,66 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) itDoc!=list.end(); ++itDoc) { - delete dynamic_cast
(*itDoc); + delete dynamic_cast(*itDoc); } } /** * \brief adds *the* Meta to a partially created DICOMDIR - */ - -DicomDirMeta * DicomDir::NewMeta() + */ +DicomDirMeta *DicomDir::NewMeta() { - DicomDirMeta *m = new DicomDirMeta(); - - if ( TagHT.begin() != TagHT.end() ) // after Document Parsing + if( MetaElems ) + delete MetaElems; + + DocEntry *entry = GetFirstEntry(); + if( entry ) { - TagDocEntryHT::iterator lastOneButSequence = TagHT.end(); - lastOneButSequence --; - // ALL the 'out of Sequence' Tags belong to Meta Elems - // (we skip 0004|1220 [Directory record sequence] ) - for ( TagDocEntryHT::iterator cc = TagHT.begin(); - cc != lastOneButSequence; - ++cc) + MetaElems = new DicomDirMeta(true); + + entry = GetFirstEntry(); + while( entry ) { - m->AddEntry( cc->second ); + if( dynamic_cast(entry) ) + break; + + RemoveEntryNoDestroy(entry); + MetaElems->AddEntry(entry); + + entry = GetFirstEntry(); } } else // after root directory parsing { - ListDicomDirMetaElem const &elemList = - Global::GetDicomDirElements()->GetDicomDirMetaElements(); - m->FillObject(elemList); + MetaElems = new DicomDirMeta(false); } - m->SetSQItemNumber(0); // To avoid further missprinting - return m; + MetaElems->SetSQItemNumber(0); // To avoid further missprinting + return MetaElems; } /** - * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR + * \brief adds a new Patient (with the basic elements) to a partially created + * DICOMDIR */ DicomDirPatient *DicomDir::NewPatient() { - ListDicomDirPatientElem::const_iterator it; - uint16_t tmpGr,tmpEl; - DictEntry *dictEntry; - ValEntry *entry; - - ListDicomDirPatientElem const & elemList = - Global::GetDicomDirElements()->GetDicomDirPatientElements(); DicomDirPatient *p = new DicomDirPatient(); + AddPatientToEnd( p ); + return p; +} - // for all the DicomDirPatient Elements - for( it = elemList.begin(); it != elemList.end(); ++it ) +/** + * \brief Remove all Patients + */ +void DicomDir::ClearPatient() +{ + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); + ++cc) { - tmpGr = it->Group; - tmpEl = it->Elem; - dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl); - entry = new ValEntry( dictEntry ); - entry->SetOffset(0); // just to avoid further missprinting - entry->SetValue( it->Value ); - - p->AddEntry( entry ); + delete *cc; } - - Patients.push_front( p ); - - return p; + Patients.clear(); } /** @@ -543,43 +515,47 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { case GDCM_DICOMDIR_IMAGE: elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); - si = new DicomDirImage(); - if( !AddDicomDirImageToEnd(static_cast(si)) ) + si = new DicomDirImage(true); + if( !AddImageToEnd(static_cast(si)) ) { - gdcmVerboseMacro( "Add DicomDirImageToEnd failed"); + delete si; + gdcmErrorMacro( "Add ImageToEnd failed"); } break; case GDCM_DICOMDIR_SERIE: elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); - si = new DicomDirSerie(); - if( !AddDicomDirSerieToEnd(static_cast(si)) ) + si = new DicomDirSerie(true); + if( !AddSerieToEnd(static_cast(si)) ) { - gdcmVerboseMacro( "Add DicomDirSerieToEnd failed"); + delete si; + gdcmErrorMacro( "Add SerieToEnd failed"); } break; case GDCM_DICOMDIR_STUDY: elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); - si = new DicomDirStudy(); - if( !AddDicomDirStudyToEnd(static_cast(si)) ) + si = new DicomDirStudy(true); + if( !AddStudyToEnd(static_cast(si)) ) { - gdcmVerboseMacro( "Add DicomDirStudyToEnd failed"); + delete si; + gdcmErrorMacro( "Add StudyToEnd failed"); } break; case GDCM_DICOMDIR_PATIENT: elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); - si = new DicomDirPatient(); - if( !AddDicomDirPatientToEnd(static_cast(si)) ) + si = new DicomDirPatient(true); + if( !AddPatientToEnd(static_cast(si)) ) { - gdcmVerboseMacro( "Add DicomDirPatientToEnd failed"); + delete si; + gdcmErrorMacro( "Add PatientToEnd failed"); } break; case GDCM_DICOMDIR_META: elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); - si = new DicomDirMeta(); + si = new DicomDirMeta(true); if( MetaElems ) { - gdcmVerboseMacro( "MetaElements already exist, they will be destroyed"); delete MetaElems; + gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); } MetaElems = static_cast(si); break; @@ -594,13 +570,14 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later // for all the relevant elements found in their own spot of the DicomDir.dic + // FIXME : troubles found when it's a SeqEntry for( it = elemList.begin(); it != elemList.end(); ++it) { tmpGr = it->Group; tmpEl = it->Elem; - dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl); + dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! @@ -610,7 +587,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { // NULL when we Build Up (ex nihilo) a DICOMDIR // or when we add the META elems - val = header->GetEntry(tmpGr, tmpEl); + val = header->GetEntryValue(tmpGr, tmpEl); } else { @@ -651,14 +628,12 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { - std::cout << "GDCM_DICOMDIR_META ?!? should never print that" - << std::endl; + gdcmVerboseMacro("GDCM_DICOMDIR_META ?!? should never print that"); } si->AddEntry(entry); } } -//----------------------------------------------------------------------------- /** * \brief CallStartMethod */ @@ -672,7 +647,6 @@ void DicomDir::CallStartMethod() } } -//----------------------------------------------------------------------------- /** * \brief CallProgressMethod */ @@ -684,7 +658,6 @@ void DicomDir::CallProgressMethod() } } -//----------------------------------------------------------------------------- /** * \brief CallEndMethod */ @@ -699,12 +672,33 @@ void DicomDir::CallEndMethod() //----------------------------------------------------------------------------- // Private +/** + * \brief Sets all fields to NULL + */ +void DicomDir::Initialize() +{ + StartMethod = NULL; + ProgressMethod = NULL; + EndMethod = NULL; + StartMethodArgDelete = NULL; + ProgressMethodArgDelete = NULL; + EndMethodArgDelete = NULL; + StartArg = NULL; + ProgressArg = NULL; + EndArg = NULL; + + Progress = 0.0; + Abort = false; + + MetaElems = NULL; +} + /** * \brief create a 'DicomDir' from a DICOMDIR Header */ void DicomDir::CreateDicomDir() { - // The list is parsed. + // The SeqEntries of "Directory Record Sequence" are parsed. // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found : // 1 - we save the beginning iterator // 2 - we continue to parse @@ -716,7 +710,7 @@ void DicomDir::CreateDicomDir() DocEntry *e = GetDocEntry(0x0004, 0x1220); if ( !e ) { - gdcmVerboseMacro( "NO Directory record sequence (0x0004,0x1220)"); + gdcmVerboseMacro( "No Directory Record Sequence (0004,1220) found"); /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? return; } @@ -724,22 +718,20 @@ void DicomDir::CreateDicomDir() SeqEntry *s = dynamic_cast(e); if ( !s ) { - gdcmVerboseMacro( "No SeqEntry present"); - // useless : (0x0004,0x1220) IS a Sequence ! + gdcmVerboseMacro( "Element (0004,1220) is not a Sequence ?!?"); return; } - MetaElems = NewMeta(); - - ListSQItem listItems = s->GetSQItems(); + NewMeta(); DocEntry *d; std::string v; SQItem *si; - for( ListSQItem::iterator i = listItems.begin(); - i !=listItems.end(); ++i ) + + SQItem *tmpSI=s->GetFirstSQItem(); + while(tmpSI) { - d = (*i)->GetDocEntry(0x0004, 0x1430); // Directory Record Type + d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type if ( ValEntry* valEntry = dynamic_cast(d) ) { v = valEntry->GetValue(); @@ -752,23 +744,43 @@ void DicomDir::CreateDicomDir() if( v == "PATIENT " ) { - si = new DicomDirPatient(); - AddDicomDirPatientToEnd( static_cast(si) ); + si = new DicomDirPatient(true); + if( !AddPatientToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add PatientToEnd failed"); + } } else if( v == "STUDY " ) { - si = new DicomDirStudy(); - AddDicomDirStudyToEnd( static_cast(si) ); + si = new DicomDirStudy(true); + if( !AddStudyToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddStudyToEnd failed"); + } } else if( v == "SERIES" ) { - si = new DicomDirSerie(); - AddDicomDirSerieToEnd( static_cast(si) ); + si = new DicomDirSerie(true); + if( !AddSerieToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddSerieToEnd failed"); + } } else if( v == "IMAGE " ) { - si = new DicomDirImage(); - AddDicomDirImageToEnd( static_cast(si) ); + si = new DicomDirImage(true); + if( !AddImageToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddImageToEnd failed"); + } } else { @@ -776,67 +788,55 @@ void DicomDir::CreateDicomDir() // neither an 'IMAGE' SQItem. Skip to next item. continue; } - MoveSQItem(si,*i); - } - TagHT.clear(); -} + if( si ) + MoveSQItem(si,tmpSI); -/** - * \brief Well ... there is only one occurence - */ -bool DicomDir::AddDicomDirMeta() -{ - if( MetaElems ) - { - delete MetaElems; + tmpSI=s->GetNextSQItem(); } - MetaElems = new DicomDirMeta(); - return true; + ClearEntry(); } /** - * \brief AddDicomDirPatientToEnd + * \brief AddPatientToEnd * @param dd SQ Item to enqueue to the DicomPatient chained List */ -bool DicomDir::AddDicomDirPatientToEnd(DicomDirPatient *dd) +bool DicomDir::AddPatientToEnd(DicomDirPatient *dd) { Patients.push_back(dd); return true; } /** - * \brief AddDicomDirStudyToEnd + * \brief AddStudyToEnd * @param dd SQ Item to enqueue to the DicomDirStudy chained List */ -bool DicomDir::AddDicomDirStudyToEnd(DicomDirStudy *dd) +bool DicomDir::AddStudyToEnd(DicomDirStudy *dd) { if( Patients.size() > 0 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; - (*itp)->AddDicomDirStudy(dd); + (*itp)->AddStudy(dd); return true; } return false; } /** - * \brief AddDicomDirSerieToEnd + * \brief AddSerieToEnd * @param dd SQ Item to enqueue to the DicomDirSerie chained List */ -bool DicomDir::AddDicomDirSerieToEnd(DicomDirSerie *dd) +bool DicomDir::AddSerieToEnd(DicomDirSerie *dd) { if( Patients.size() > 0 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; - if( (*itp)->GetDicomDirStudies().size() > 0 ) + DicomDirStudy *study = (*itp)->GetLastStudy(); + if( study ) { - ListDicomDirStudy::const_iterator itst = - (*itp)->GetDicomDirStudies().end(); - itst--; - (*itst)->AddDicomDirSerie(dd); + study->AddSerie(dd); return true; } } @@ -844,27 +844,23 @@ bool DicomDir::AddDicomDirSerieToEnd(DicomDirSerie *dd) } /** - * \brief AddDicomDirImageToEnd + * \brief AddImageToEnd * @param dd SQ Item to enqueue to the DicomDirImage chained List */ -bool DicomDir::AddDicomDirImageToEnd(DicomDirImage *dd) +bool DicomDir::AddImageToEnd(DicomDirImage *dd) { if( Patients.size() > 0 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; - if( (*itp)->GetDicomDirStudies().size() > 0 ) + DicomDirStudy *study = (*itp)->GetLastStudy(); + if( study ) { - ListDicomDirStudy::const_iterator itst = - (*itp)->GetDicomDirStudies().end(); - itst--; - - if( (*itst)->GetDicomDirSeries().size() > 0 ) + DicomDirSerie *serie = study->GetLastSerie(); + if( serie ) { - ListDicomDirSerie::const_iterator its = (*itst)->GetDicomDirSeries().end(); - its--; - (*its)->AddDicomDirImage(dd); + serie->AddImage(dd); return true; } } @@ -873,14 +869,15 @@ bool DicomDir::AddDicomDirImageToEnd(DicomDirImage *dd) } /** - * \brief for each Header of the chained list, add/update the Patient/Study/Serie/Image info + * \brief for each Header of the chained list, + * add/update the Patient/Study/Serie/Image info * @param path path of the root directory * @param list chained list of Headers */ void DicomDir::SetElements(std::string const & path, VectDocument const &list) { - TagHT.clear(); - Patients.clear(); + ClearEntry(); + ClearPatient(); std::string patPrevName = "", patPrevID = ""; std::string studPrevInstanceUID = "", studPrevID = ""; @@ -895,12 +892,12 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) it != list.end(); ++it ) { // get the current file characteristics - patCurName = (*it)->GetEntry(0x0010,0x0010); - patCurID = (*it)->GetEntry(0x0010,0x0011); - studCurInstanceUID = (*it)->GetEntry(0x0020,0x000d); - studCurID = (*it)->GetEntry(0x0020,0x0010); - serCurInstanceUID = (*it)->GetEntry(0x0020,0x000e); - serCurID = (*it)->GetEntry(0x0020,0x0011); + patCurName = (*it)->GetEntryValue(0x0010,0x0010); + patCurID = (*it)->GetEntryValue(0x0010,0x0011); + studCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000d); + studCurID = (*it)->GetEntryValue(0x0020,0x0010); + serCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000e); + serCurID = (*it)->GetEntryValue(0x0020,0x0011); if( patCurName != patPrevName || patCurID != patPrevID || first ) { @@ -938,64 +935,55 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) } /** - * \brief Move the content of the src SQItem to the dst SQItem + * \brief Move the content of the source SQItem to the destination SQItem * Only DocEntry's are moved - * + * @param dst destination SQItem + * @param src source SQItem */ -void DicomDir::MoveSQItem(SQItem *dst,SQItem *src) +void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src) { DocEntry *entry; - src->Initialize(); - entry = src->GetNextEntry(); + entry = src->GetFirstEntry(); while(entry) { src->RemoveEntryNoDestroy(entry); dst->AddEntry(entry); - - src->Initialize(); - entry = src->GetNextEntry(); + // we destroyed -> the current iterator is not longer valid + entry = src->GetFirstEntry(); } } /** - * \brief compares two dgcmHeaders + * \brief compares two files */ bool DicomDir::HeaderLessThan(Document *header1, Document *header2) { return *header1 < *header2; } - -/** - * \brief Get the first entry while visiting the DicomDirPatients - * \return The next DicomDirPatient if found, otherwhise NULL - */ -DicomDirPatient *DicomDir::GetFirstEntry() -{ - ItDicomDirPatient = Patients.begin(); - if ( ItDicomDirPatient != Patients.end() ) - return *ItDicomDirPatient; - return NULL; -} - +//----------------------------------------------------------------------------- +// Print /** - * \brief Get the next entry while visiting the DicomDirPatients - * \note : meaningfull only if GetFirstEntry already called - * \return The next DicomDirPatient if found, otherwhise NULL + * \brief Canonical Printer + * @param os ostream we want to print in + * @param indent Indentation string to be prepended during printing */ -DicomDirPatient *DicomDir::GetNextEntry() +void DicomDir::Print(std::ostream &os, std::string const & ) { - gdcmAssertMacro (ItDicomDirPatient != Patients.end()); + if( MetaElems ) { - ++ItDicomDirPatient; - if ( ItDicomDirPatient != Patients.end() ) - return *ItDicomDirPatient; + MetaElems->SetPrintLevel(PrintLevel); + MetaElems->Print(os); + } + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); + ++cc) + { + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); } - return NULL; } - -} // end namespace gdcm - //----------------------------------------------------------------------------- +} // end namespace gdcm