X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=1bd8fd227ad93a80c9ebb554a789051108cc97e1;hb=922095a0dd56f24d651b36f62256690020937d9a;hp=16f0e63b29772bda8289732478ab09f87bd9df3d;hpb=d13926efb3131d364199ef4672b73ce73d21dbce;p=gdcm.git diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx index 16f0e63b..1bd8fd22 100644 --- a/Testing/TestDicomDir.cxx +++ b/Testing/TestDicomDir.cxx @@ -1,156 +1,157 @@ -#include -#include "gdcm.h" -#include "gdcmHeaderEntry.h" -#include "gdcmDICOMDIR.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: TestDicomDir.cxx,v $ + Language: C++ + Date: $Date: 2004/12/07 09:08:45 $ + Version: $Revision: 1.23 $ + + 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 -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif - -#define ostringstream ostrstream -//extern "C" - - -void aff (ListTag::iterator deb, ListTag::iterator fin); - -// =============================================================================== -void aff (ListTag::iterator deb, ListTag::iterator fin, int nbFFFE) { - int count =0; - for (ListTag::iterator i= deb; i!= fin; i++) { - if( (*i)->GetGroup() == 0xfffe) { - count ++; - if (count == nbFFFE) break; - } - (*i)->SetPrintLevel(0); - (*i)->Print(); - } -} - - -int main(int argc, char* argv[]) +int TestDicomDir(int argc, char* argv[]) { - gdcmDICOMDIR* e1; - unsigned short int g, e; - int o; - TSKey v; + gdcm::DicomDir *e1; + + gdcm::ListDicomDirPatient::const_iterator itPatient; + gdcm::ListDicomDirStudy::const_iterator itStudy; + gdcm::ListDicomDirSerie::const_iterator itSerie; + //gdcm::ListDicomDirImage::const_iterator itImage; + gdcm::TSKey v; - string a; + std::string file; if (argc > 1) - a = argv[1]; - else - a = "DICOMDIR"; - - e1 = new gdcmDICOMDIR(a); + file = argv[1]; + else { + file += GDCM_DATA_ROOT; + file += "/DICOMDIR"; + } - if(e1->GetPatients().begin() == e1->GetPatients().end() ) - std::cout << "Liste Vide" << std::endl; + e1 = new gdcm::DicomDir(file); + if (argc > 2) { + int level = atoi(argv[2]); + e1->SetPrintLevel(level); + } -// Exemples exploitation de la structure + if(e1->GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() ) + { + std::cout<<"Empty list"<GetPatients().begin(); - while ( itPatient != e1->GetPatients().end() ) { // on degouline la liste de PATIENT - //cout << " = PATIENT ==========================================" << std::endl; - //deb = (*itPatient)->beginObj; - //fin = (*((*itPatient)->GetStudies()).begin())->beginObj; - //e1->SetPrintLevel(2); - //aff(deb,fin,1); - std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name - itPatient ++; - } + 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 + itPatient ++; + } +*/ +/* cout << std::endl << std::endl << " = Liste des PATIENT/STUDY ==========================================" - << std::endl<< std::endl; - - itPatient = e1->GetPatients().begin(); - while ( itPatient != e1->GetPatients().end() ) { // on degouline la liste de PATIENT - std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name - lStudy::iterator itStudy = ((*itPatient)->GetStudies()).begin(); - while (itStudy != (*itPatient)->GetStudies().end() ) { // on degouline les STUDY de ce patient - std::cout << "--- "<< (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << std::endl; // Stdy Description - - - ++itStudy; - } - itPatient ++; - } - - cout << std::endl << std::endl - << " = Liste des PATIENT/STUDY/SERIE ==========================================" - << std::endl<< std::endl; + << 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 ++; + } + */ - itPatient = e1->GetPatients().begin(); - while ( itPatient != e1->GetPatients().end() ) { // on degouline la liste de PATIENT - std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name - lStudy::iterator itStudy = ((*itPatient)->GetStudies()).begin(); - while (itStudy != (*itPatient)->GetStudies().end() ) { // on degouline les STUDY de ce patient - std::cout << "--- "<< (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << std::endl; // Study Description - lSerie::iterator itSerie = ((*itStudy)->GetSeries()).begin(); - while (itSerie != (*itStudy)->GetSeries().end() ) { // on degouline les SERIES de cette study - std::cout << "--- --- "<< (*itSerie)->GetEntryByNumber(0x0008, 0x103e) << std::endl; // Serie Description - ++itSerie; - } - ++itStudy; - } - itPatient ++; - } + std::cout << std::endl << std::endl + << " = Liste des PATIENT/STUDY/SERIE ==========================================" + << std::endl<< std::endl; - cout << std::endl << std::endl - << " = Contenu Complet du DICOMDIR ==========================================" - << 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 ++; + } - - itPatient = e1->GetPatients().begin(); - while ( itPatient != e1->GetPatients().end() ) { // on degouline la liste de PATIENT - cout << " = PATIENT ==========================================" << std::endl; - deb = (*itPatient)->beginObj; - fin = (*((*itPatient)->GetStudies()).begin())->beginObj; - e1->SetPrintLevel(2); - aff(deb,fin,1); - - lStudy::iterator itStudy = ((*itPatient)->GetStudies()).begin(); - while (itStudy != (*itPatient)->GetStudies().end() ) { // on degouline les STUDY de ce patient - std::cout << " ==== STUDY ==========================================" <beginObj; - fin = (*((*itStudy)->GetSeries()).begin())->beginObj; - //e1->SetPrintLevel(2); - aff(deb,fin,1); - - lSerie::iterator itSerie = ((*itStudy)->GetSeries()).begin(); - while (itSerie != (*itStudy)->GetSeries().end() ) { // on degouline les SERIES de cette study - cout << " ======= SERIES ==========================================" << std::endl; - deb = (*itSerie)->beginObj; - fin = (*((*itSerie)->GetImages()).begin())->beginObj; - //e1->SetPrintLevel(2); - aff(deb,fin,1); - - lImage::iterator itImage = ((*itSerie)->GetImages()).begin(); - while (itImage != (*itSerie)->GetImages().end() ) { // on degouline les IMAGE de cette serie - - cout << " ========== IMAGE ==========================================" << std::endl; - std::cout << "--- --- --- File Name: "<< (*itImage)->GetEntryByNumber(0x0004, 0x1500) << std::endl; // Referenced File - - ++itImage; - } - ++itSerie; - } - ++itStudy; - } - itPatient ++; - } - delete e1; + /* + 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; + } + ++itSerie; + } + ++itStudy; + } + itPatient ++; + } + */ + + std::cout << std::endl << std::endl + << " = Contenu Complet du DICOMDIR ==========================================" + << std::endl<< std::endl; + e1->Print(); + + std::cout<