X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=64bc7d754973270cb1b99777ae3936327e1d8b42;hb=29d99c3881a2f97c5e08a79ea107cc2bf525dc4f;hp=73710b1e60496013554d2d3afe2cabef0af756d9;hpb=2f27193f6cbd42d1143738e40563b4a4bd4a0c8a;p=gdcm.git diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx index 73710b1e..64bc7d75 100644 --- a/Testing/TestDicomDir.cxx +++ b/Testing/TestDicomDir.cxx @@ -1,136 +1,127 @@ -#include "gdcm.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: TestDicomDir.cxx,v $ + Language: C++ + Date: $Date: 2005/01/26 16:43:10 $ + Version: $Revision: 1.33 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #include "gdcmDocEntry.h" #include "gdcmDicomDir.h" +#include "gdcmDicomDirPatient.h" +#include "gdcmDicomDirStudy.h" +#include "gdcmDicomDirSerie.h" +#include "gdcmDicomDirImage.h" +#include "gdcmTS.h" #include #include int TestDicomDir(int argc, char* argv[]) { - gdcm::DicomDir *e1; + gdcm::DicomDir *dicomdir; - gdcm::ListDicomDirPatient::const_iterator itPatient; - gdcm::ListDicomDirStudy::const_iterator itStudy; - gdcm::ListDicomDirSerie::const_iterator itSerie; - gdcm::ListDicomDirImage::const_iterator itImage; + gdcm::DicomDirPatient *pa; + gdcm::DicomDirStudy *st; + gdcm::DicomDirSerie *se; + gdcm::DicomDirImage *im; + gdcm::TSKey v; std::string file; if (argc > 1) file = argv[1]; - else { + else + { file += GDCM_DATA_ROOT; file += "/DICOMDIR"; - } - - e1 = new gdcm::DicomDir(file); - if (argc > 2) { - int level = atoi(argv[2]); - e1->SetPrintLevel(level); } - if(e1->GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() ) + dicomdir = new gdcm::DicomDir(file); + if (argc > 2) { - std::cout<<"Empty list"<SetPrintLevel(level); } -// Simple examples of structure exploitation -// DON'T REMOVE neither the following code, nor the commented out lines + // Test if the DicomDir is readable + if( !dicomdir->IsReadable() ) + { + std::cout<<" DicomDir '"<GetFirstPatient() ) + { + std::cout<<" DicomDir '"<GetDicomDirPatients().begin(); - while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline la liste de PATIENT - std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name - itPatient ++; + delete dicomdir; + return 1; } -*/ - -/* - cout << std::endl << std::endl - << " = Liste des PATIENT/STUDY ==========================================" - << std::endl<< std::endl; - itPatient = e1->GetDicomDirPatients().begin(); - while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline la liste de PATIENT - std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name - itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); - while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient - std::cout << "--- "<< (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << std::endl; // Study Description - ++itStudy; - } - itPatient ++; - } - */ - + // step by step structure full exploitation std::cout << std::endl << std::endl - << " = Liste des PATIENT/STUDY/SERIE ==========================================" + << " = PATIENT/STUDY/SERIE/IMAGE List ============================" << std::endl<< std::endl; - - itPatient = e1->GetDicomDirPatients().begin(); - while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline la liste de PATIENT - // Patient's Name, Patient ID - std::cout << "Pat.Name:[" << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) <<"]"; - std::cout << " Pat.ID:["; - std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0020) << "]" << std::endl; - itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); - while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient - std::cout << "--- Stud.descr:[" << (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << "]";// Study Description - std::cout << " Stud.ID:["<< (*itStudy)->GetEntryByNumber(0x0020, 0x0010); // Study ID - std::cout << "]" << std::endl; - itSerie = ((*itStudy)->GetDicomDirSeries()).begin(); - while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { // on degouline les SERIES de cette study - std::cout << "--- --- Ser.Descr:["<< (*itSerie)->GetEntryByNumber(0x0008, 0x103e)<< "]";// Serie Description - std::cout << " Ser.nb:[" << (*itSerie)->GetEntryByNumber(0x0020, 0x0011); // Serie number - std::cout << "] Mod.:[" << (*itSerie)->GetEntryByNumber(0x0008, 0x0060) << "]"; // Modality - std::cout << std::endl; - ++itSerie; - } - ++itStudy; - } - itPatient ++; - } - - - /* - cout << std::endl << std::endl - << " = Liste des PATIENT/STUDY/SERIE/IMAGE ===================================" - << std::endl<< std::endl; - - itPatient = e1->GetDicomDirPatients().begin(); - while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline la liste de PATIENT - std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name - itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); - while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient - std::cout << "--- "<< (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << std::endl; // Study Description - itSerie = ((*itStudy)->GetDicomDirSeries()).begin(); - while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { // on degouline les SERIES de cette study - std::cout << "--- --- "<< (*itSerie)->GetEntryByNumber(0x0008, 0x103e) << std::endl; // Serie Description - itImage = ((*itSerie)->GetDicomDirImages()).begin(); - while (itImage != (*itSerie)->GetDicomDirImages().end() ) { // on degouline les SERIES de cette study - std::cout << "--- --- --- "<< (*itImage)->GetEntryByNumber(0x0004, 0x1500) << std::endl; // File name - ++itImage; + + pa = dicomdir->GetFirstPatient(); + while ( pa ) + { // we process all the PATIENT of this DICOMDIR + std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name + + st = pa->GetFirstStudy(); + while ( st ) + { // we process all the STUDY of this patient + std::cout << "--- "<< st->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description + std::cout << " Stud.ID:[" << st->GetEntryValue(0x0020, 0x0010); // Study ID + + se = st->GetFirstSerie(); + while ( se ) + { // we process all the SERIES of this study + std::cout << "--- --- "<< se->GetEntryValue(0x0008, 0x103e) << std::endl; // Serie Description + std::cout << " Ser.nb:[" << se->GetEntryValue(0x0020, 0x0011); // Series number + std::cout << "] Mod.:[" << se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality + + im = se->GetFirstImage(); + while ( im ) { // we process all the IMAGE of this serie + std::cout << "--- --- --- "<< im->GetEntryValue(0x0004, 0x1500) << std::endl; // File name + im = se->GetNextImage(); } - ++itSerie; + se = st->GetNextSerie(); } - ++itStudy; + st = pa->GetNextStudy(); } - itPatient ++; - } - */ + pa = dicomdir->GetNextPatient(); + } std::cout << std::endl << std::endl - << " = Contenu Complet du DICOMDIR ==========================================" - << std::endl<< std::endl; - e1->Print(); + << " = DICOMDIR full content ====================================" + << std::endl<< std::endl; + dicomdir->Print(); std::cout<