X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintDicomDir.cxx;h=29dfdc800a0655b8535bb22a16877cf967f972bf;hb=17daf7e7caceddf44e73864ee8d366613a1f0c82;hp=adbc4c18ef1b343f772444ae9e1e13c454a8edbe;hpb=4d992954520d43c6f2fb555b7cd721574978c23a;p=gdcm.git diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx index adbc4c18..29dfdc80 100644 --- a/Example/PrintDicomDir.cxx +++ b/Example/PrintDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/07/07 17:31:53 $ - Version: $Revision: 1.24 $ + Date: $Date: 2005/10/25 14:52:27 $ + Version: $Revision: 1.30 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,9 +17,9 @@ =========================================================================*/ #include "gdcmDocument.h" #include "gdcmDicomDir.h" -#include "gdcmValEntry.h" #include "gdcmDicomDirPatient.h" #include "gdcmDicomDirStudy.h" +#include "gdcmDicomDirVisit.h" #include "gdcmDicomDirSerie.h" #include "gdcmDicomDirImage.h" #include "gdcmTS.h" @@ -45,7 +45,7 @@ int main(int argc, char* argv[]) // Initialize Arguments Manager gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv); - if (argc == 1) + if (argc == 1 || am->ArgMgrDefined("usage") ) { am->ArgMgrUsage(usage); // Display 'usage' delete am; @@ -58,6 +58,7 @@ int main(int argc, char* argv[]) gdcm::DicomDirPatient *pa; gdcm::DicomDirStudy *st; gdcm::DicomDirSerie *se; + gdcm::DicomDirVisit *vs; gdcm::DicomDirImage *im; char *fileName; @@ -78,14 +79,11 @@ int main(int argc, char* argv[]) return 0; } - // new style is useless, since it has no effect for *reading* a DICOMDIR - // (only meaningfull when *creating* a DICOMDIR) + // new gdcm2 style - f = new gdcm::DicomDir( fileName ); - - //f = new gdcm::DicomDir(); - //f->SetParseDir(false); - //f->Load( fileName ); + f = gdcm::DicomDir::New(); + f->SetFileName ( fileName ); + f->Load( ); // Test if the DicomDir is readable if( !f->IsReadable() ) @@ -94,7 +92,7 @@ int main(int argc, char* argv[]) <<"' is not readable"<Delete(); return 1; } @@ -102,129 +100,167 @@ int main(int argc, char* argv[]) // Test if the DicomDir contains any Patient pa = f->GetFirstPatient(); - if ( pa == 0) + if ( pa == 0) { std::cout<<" DicomDir '"<Delete(); return 1; } // Structure use Examples switch (detailLevel) - { - case 1: - std::cout << std::endl << std::endl - << " = PATIENT List ==========================================" - << std::endl<< std::endl; - - pa = f->GetFirstPatient(); - while (pa) - { - std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name - pa = f->GetNextPatient(); - } - break; - - case 2: - std::cout << std::endl << std::endl - << " = PATIENT/STUDY List =======================================" - << std::endl<< std::endl; - - pa = f->GetFirstPatient(); - while ( pa ) // on degouline les PATIENT de ce DICOMDIR - { - std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name - - st = pa->GetFirstStudy(); - while ( st ) { // on degouline les STUDY de ce patient - std::cout << "--- "<< st->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description - st = pa->GetNextStudy(); + { + case 1: + std::cout << std::endl << std::endl + << " = PATIENT List ==========================================" + << std::endl<< std::endl; + + pa = f->GetFirstPatient(); + while (pa) + { + std::cout << "Pat.Name:[" << pa->GetEntryString(0x0010, 0x0010) <<"]"; // Patient's Name + std::cout << " Pat.ID:["; + std::cout << pa->GetEntryString(0x0010, 0x0020) << "]" << std::endl; // Patient ID + pa = f->GetNextPatient(); } - pa = f->GetNextPatient(); - } - break; + break; + + case 2: + std::cout << std::endl << std::endl + << " = PATIENT/STUDY List =======================================" + << std::endl<< std::endl; + + pa = f->GetFirstPatient(); + while ( pa ) // on degouline les PATIENT de ce DICOMDIR + { + std::cout << "Pat.Name:[" << pa->GetEntryString(0x0010, 0x0010) <<"]"; // Patient's Name + std::cout << " Pat.ID:["; + std::cout << pa->GetEntryString(0x0010, 0x0020) << "]" << std::endl; // Patient ID + st = pa->GetFirstStudy(); + while ( st ) + { // on degouline les STUDY de ce patient + std::cout << "--- Stud.descr:[" << st->GetEntryString(0x0008, 0x1030) << "]"; // Study Description + std::cout << " Stud.ID:[" << st->GetEntryString(0x0020, 0x0010) << "]"; // Study ID + std::cout << std::endl; + st = pa->GetNextStudy(); + } + pa = f->GetNextPatient(); + } + break; + + case 3: + std::cout << std::endl << std::endl + << " = PATIENT/STUDY/SERIE List ==================================" + << std::endl<< std::endl; + + pa = f->GetFirstPatient(); + while ( pa ) // on degouline les PATIENT de ce DICOMDIR + { + // Patient's Name, Patient ID + std::cout << "Pat.Name:[" << pa->GetEntryString(0x0010, 0x0010) <<"]"; // Patient's Name + std::cout << " Pat.ID:["; + std::cout << pa->GetEntryString(0x0010, 0x0020) << "]" << std::endl; // Patient ID + + st = pa->GetFirstStudy(); + while ( st ) + { // on degouline les STUDY de ce patient + std::cout << "--- Stud.descr:[" << st->GetEntryString(0x0008, 0x1030) << "]"; // Study Description + std::cout << " Stud.ID:[" << st->GetEntryString(0x0020, 0x0010) << "]"; // Study ID + std::cout << std::endl; + + se = st->GetFirstSerie(); + while ( se ) + { // on degouline les SERIES de cette study + std::cout << "--- --- Ser.Descr:["<< se->GetEntryString(0x0008, 0x103e)<< "]"; // Series Description + std::cout << " Ser.nb:[" << se->GetEntryString(0x0020, 0x0011); // Series number + std::cout << "] Mod.:[" << se->GetEntryString(0x0008, 0x0060) << "]"; // Modality + std::cout << std::endl; + se = st->GetNextSerie(); + } - case 3: - std::cout << std::endl << std::endl - << " = PATIENT/STUDY/SERIE List ==================================" - << std::endl<< std::endl; + vs = st->GetFirstVisit(); + while ( vs ) + { // on degouline les VISIT de cette study + std::cout << "--- --- VISIT: "; + std::cout << " Ref. File ID :[" << vs->GetEntryString(0x0004, 0x1500) << "]"; // Referenced File ID + std::cout << " Inst.Name:[" << vs->GetEntryString(0x0008,0x0080) << "]"; // Institution Name + std::cout << " Adm.ID:[" << vs->GetEntryString(0x0038, 0x0010) << "]"; // Admission ID + std::cout << " Adm. date:[" << vs->GetEntryString(0x0038, 0x0020) << "]"; // Admitting Date + std::cout << std::endl; + vs = st->GetNextVisit(); + } - pa = f->GetFirstPatient(); - while ( pa ) // on degouline les PATIENT de ce DICOMDIR - { - // Patient's Name, Patient ID - std::cout << "Pat.Name:[" << pa->GetEntryValue(0x0010, 0x0010) <<"]"; // Patient's Name - std::cout << " Pat.ID:["; - std::cout << pa->GetEntryValue(0x0010, 0x0020) << "]" << std::endl; // Patient ID - - st = pa->GetFirstStudy(); - while ( st ) { // on degouline les STUDY de ce patient - std::cout << "--- Stud.descr:[" << st->GetEntryValue(0x0008, 0x1030) << "]";// Study Description - std::cout << " Stud.ID:[" << st->GetEntryValue(0x0020, 0x0010); // Study ID - std::cout << "]" << std::endl; - - se = st->GetFirstSerie(); - while ( se ) { // on degouline les SERIES de cette study - std::cout << "--- --- Ser.Descr:["<< se->GetEntryValue(0x0008, 0x103e)<< "]"; // Series Description - std::cout << " Ser.nb:[" << se->GetEntryValue(0x0020, 0x0011); // Series number - std::cout << "] Mod.:[" << se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality - std::cout << std::endl; - se = st->GetNextSerie(); + st = pa->GetNextStudy(); } - st = pa->GetNextStudy(); - } - pa = f->GetNextPatient(); - } - break; - - case 4: - std::cout << std::endl << std::endl - << " = PATIENT/STUDY/SERIE/IMAGE List ============================" - << std::endl<< std::endl; - - pa = f->GetFirstPatient(); - while ( pa ) { // les PATIENT de ce DICOMDIR - // Patient's Name, Patient ID - std::cout << "Pat.Name:[" << pa->GetEntryValue(0x0010, 0x0010) <<"]"; // Patient's Name - std::cout << " Pat.ID:["; - std::cout << pa->GetEntryValue(0x0010, 0x0020) << "]" << std::endl; // Patient ID - - st = pa->GetFirstStudy(); - while ( st ) { // on degouline les STUDY de ce patient - std::cout << "--- Stud.descr:[" << st->GetEntryValue(0x0008, 0x1030) << "]";// Study Description - std::cout << " Stud.ID:[" << st->GetEntryValue(0x0020, 0x0010); // Study ID - std::cout << "]" << std::endl; - - se = st->GetFirstSerie(); - while ( se ) { // on degouline les SERIES de cette study - std::cout << "--- --- Ser.Descr:["<< se->GetEntryValue(0x0008, 0x103e)<< "]"; // Series Description - std::cout << " Ser.nb:[" << se->GetEntryValue(0x0020, 0x0011); // Series number - std::cout << "] Mod.:[" << se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality - std::cout << std::endl; - - im = se->GetFirstImage(); - while ( im ) { // on degouline les Images de cette serie - std::cout << "--- --- --- "<< im->GetEntryValue(0x0004, 0x1500) << std::endl; // File name - im = se->GetNextImage(); + pa = f->GetNextPatient(); + } + break; + + case 4: + std::cout << std::endl << std::endl + << " = PATIENT/STUDY/SERIE/IMAGE List ============================" + << std::endl<< std::endl; + + pa = f->GetFirstPatient(); + while ( pa ) + { // les PATIENT de ce DICOMDIR + // Patient's Name, Patient ID + std::cout << "Pat.Name:[" << pa->GetEntryString(0x0010, 0x0010) <<"]"; // Patient's Name + std::cout << " Pat.ID:["; + std::cout << pa->GetEntryString(0x0010, 0x0020) << "]" << std::endl; // Patient ID + + st = pa->GetFirstStudy(); + while ( st ) + { // on degouline les STUDY de ce patient + std::cout << "--- Stud.descr:[" << st->GetEntryString(0x0008, 0x1030) << "]"; // Study Description + std::cout << " Stud.ID:[" << st->GetEntryString(0x0020, 0x0010) << "]"; // Study ID + std::cout << std::endl; + + vs = st->GetFirstVisit(); + while ( vs ) + { // on degouline les VISIT de cette study + std::cout << "--- --- VISIT: "; + std::cout << " Ref. File ID :[" << vs->GetEntryString(0x0004, 0x1500) << "]"; // Referenced File ID + std::cout << " Inst.Name:[" << vs->GetEntryString(0x0008,0x0080) << "]"; // Institution Name + std::cout << " Adm.ID:[" << vs->GetEntryString(0x0038, 0x0010) << "]"; // Admission ID + std::cout << " Adm. date:[" << vs->GetEntryString(0x0038, 0x0020) << "]"; // Admitting Date + std::cout << std::endl; + vs = st->GetNextVisit(); } - se = st->GetNextSerie(); - } - st = pa->GetNextStudy(); - } - pa = f->GetNextPatient(); - } - break; - - case 5: - std::cout << std::endl << std::endl - << " = DICOMDIR full content ==========================================" - << std::endl<< std::endl; - f->Print(); - break; + + se = st->GetFirstSerie(); + while ( se ) + { // on degouline les SERIES de cette study + std::cout << "--- --- Ser.Descr:["<< se->GetEntryString(0x0008, 0x103e)<< "]"; // Series Description + std::cout << " Ser.nb:[" << se->GetEntryString(0x0020, 0x0011); // Series number + std::cout << "] Mod.:[" << se->GetEntryString(0x0008, 0x0060) << "]"; // Modality + std::cout << std::endl; + + im = se->GetFirstImage(); + while ( im ) + { // on degouline les Images de cette serie + std::cout << "--- --- --- "<< " IMAGE Ref. File ID :[" << im->GetEntryString(0x0004, 0x1500) + << "]" << std::endl; // File name (Referenced File ID) + im = se->GetNextImage(); + } + se = st->GetNextSerie(); + } + st = pa->GetNextStudy(); + } + pa = f->GetNextPatient(); + } + break; + + case 5: + std::cout << std::endl << std::endl + << " = DICOMDIR full content ==========================================" + << std::endl<< std::endl; + f->Print(); + break; } // end switch @@ -243,16 +279,16 @@ int main(int argc, char* argv[]) itPatient = f->GetDicomDirPatients().begin(); while ( itPatient != f->GetDicomDirPatients().end() ) { // on degouline les PATIENT de ce DICOMDIR - std::cout << (*itPatient)->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name + std::cout << (*itPatient)->GetEntryString(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)->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description + std::cout << "--- "<< (*itStudy)->GetEntryString(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)->GetEntryValue(0x0008, 0x103e) << std::endl; // Serie Description + std::cout << "--- --- "<< (*itSerie)->GetEntryString(0x0008, 0x103e) << std::endl; // Serie Description itImage = ((*itSerie)->GetDicomDirImages()).begin(); while (itImage != (*itSerie)->GetDicomDirImages().end() ) { // on degouline les IMAGES de cette serie - std::cout << "--- --- --- "<< (*itImage)->GetEntryValue(0x0004, 0x1500) << std::endl; // File name + std::cout << "--- --- --- "<< (*itImage)->GetEntryString(0x0004, 0x1500) << std::endl; // File name ++itImage; } ++itSerie; @@ -269,7 +305,7 @@ int main(int argc, char* argv[]) else std::cout <Delete(); return(0); }