X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintDicomDir.cxx;h=f8abf2826c3804ef13384615a2f9b9076e39b810;hb=12ce4ae613d03ac7244f0a026c677e46792a8046;hp=6bc5d1813d84ec31e5aaf3aa8af8692dde751e1b;hpb=ce748c6ba413e82500292984fc90272a1cce14d6;p=gdcm.git diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx index 6bc5d181..f8abf282 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/01/13 11:05:26 $ - Version: $Revision: 1.11 $ + Date: $Date: 2005/06/08 08:09:07 $ + 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 @@ -25,124 +25,234 @@ #include "gdcmTS.h" #include "gdcmDebug.h" +#include "gdcmArgMgr.h" + #include #include int main(int argc, char* argv[]) -{ - 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; - - std::string fileName; - if (argc > 1) - fileName = argv[1]; - else +{ + START_USAGE(usage) + " \n PrintDicomDir :\n", + " Display the tree-like structure of a DICOMDIR File", + " usage: PrintDicomDir filein=fileName [level=n] [debug] ", + " detail = 1 : Patients, 2 : Studies, 3 : Series, 4 : Images ", + " 5 : Full Content ", + " level = 0,1,2 : depending on user (what he wants to see)", + " debug : user wants to run the program in 'debug mode' ", + FINISH_USAGE + + // Initialize Arguments Manager + gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv); + + if (argc == 1) { - fileName = GDCM_DATA_ROOT; - fileName += "/DICOMDIR"; + am->ArgMgrUsage(usage); // Display 'usage' + delete am; + return 0; } + + gdcm::DicomDir *e1; + gdcm::TSKey v; + + gdcm::DicomDirPatient *pa; + gdcm::DicomDirStudy *st; + gdcm::DicomDirSerie *se; + gdcm::DicomDirImage *im; + + char *fileName; + fileName = am->ArgMgrWantString("filein",usage); - if (argc > 3) - gdcm::Debug::SetDebugOn(); + int level = am->ArgMgrGetInt("level", 2); + + int detailLevel = am->ArgMgrGetInt("detail", 2); + + if (am->ArgMgrDefined("debug")) + gdcm::Debug::DebugOn(); + + /* if unused Param we give up */ + if ( am->ArgMgrPrintUnusedLabels() ) + { + am->ArgMgrUsage(usage); + delete am; + return 0; + } + + // new style is useless, since it has no effect for *reading* a DICOMDIR + // (only meaningfull when *creating* a DICOMDIR) e1 = new gdcm::DicomDir( fileName ); - if (argc > 2) { - int level = atoi(argv[2]); - e1->SetPrintLevel(level); + //e1 = new gdcm::DicomDir(); + //e1->SetParseDir(false); + //e1->Load( fileName ); + + // Test if the DicomDir is readable + if( !e1->IsReadable() ) + { + std::cout<<" DicomDir '"<GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() ) + e1->SetPrintLevel(level); + + // Test if the DicomDir contains any Patient + pa = e1->GetFirstPatient(); + if ( pa == 0) { - std::cout<<"Empty list"<GetDicomDirPatients().begin(); - while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline la liste de PATIENT - std::cout << (*itPatient)->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name - itPatient ++; - } -*/ + pa = e1->GetFirstPatient(); + while (pa) + { + std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name + pa = e1->GetNextPatient(); + } + break; -/* - cout << std::endl << std::endl + case 2: + std::cout << std::endl << std::endl << " = PATIENT/STUDY List =======================================" << std::endl<< std::endl; - itPatient = e1->GetDicomDirPatients().begin(); - while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline la liste de PATIENT - std::cout << (*itPatient)->GetEntry(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)->GetEntry(0x0008, 0x1030) << std::endl; // Study Description - ++itStudy; - } - itPatient ++; - } + pa = e1->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(); + } + pa = e1->GetNextPatient(); + } + break; - - std::cout << std::endl << std::endl + case 3: + std::cout << std::endl << std::endl << " = PATIENT/STUDY/SERIE List ==================================" << std::endl<< std::endl; - - itPatient = e1->GetDicomDirPatients().begin(); - while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline la liste de PATIENT + + pa = e1->GetFirstPatient(); + while ( pa ) // on degouline les PATIENT de ce DICOMDIR + { // Patient's Name, Patient ID - std::cout << "Pat.Name:[" << (*itPatient)->GetEntry(0x0010, 0x0010) <<"]"; // Patient's Name - std::cout << " Pat.ID:["; - std::cout << (*itPatient)->GetEntry(0x0010, 0x0020) << "]" << std::endl; // Patient ID - itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); - while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient - std::cout << "--- Stud.descr:[" << (*itStudy)->GetEntry(0x0008, 0x1030) << "]";// Study Description - std::cout << " Stud.ID:[" << (*itStudy)->GetEntry(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)->GetEntry(0x0008, 0x103e)<< "]"; // Series Description - std::cout << " Ser.nb:[" << (*itSerie)->GetEntry(0x0020, 0x0011); // Series number - std::cout << "] Mod.:[" << (*itSerie)->GetEntry(0x0008, 0x0060) << "]"; // Modality - std::cout << std::endl; - ++itSerie; + 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(); } - ++itStudy; + pa = e1->GetNextPatient(); + } + break; + + case 4: + std::cout << std::endl << std::endl + << " = PATIENT/STUDY/SERIE/IMAGE List ============================" + << std::endl<< std::endl; + + pa = e1->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(); + } + se = st->GetNextSerie(); + } + st = pa->GetNextStudy(); + } + pa = e1->GetNextPatient(); } - itPatient ++; - } - - + break; + + case 5: + std::cout << std::endl << std::endl + << " = DICOMDIR full content ==========================================" + << std::endl<< std::endl; + e1->Print(); + break; + + } // end switch + + /* - cout << std::endl << std::endl - << " = PATIENT/STUDY/SERIE/IMAGE List ============================" + // Previous code. + // Kept as an example. Please don't remove + + gdcm::ListDicomDirPatient::const_iterator itPatient; + gdcm::ListDicomDirStudy::const_iterator itStudy; + gdcm::ListDicomDirSerie::const_iterator itSerie; + gdcm::ListDicomDirImage::const_iterator itImage; + 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)->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name + while ( itPatient != e1->GetDicomDirPatients().end() ) { // on degouline les PATIENT de ce DICOMDIR + std::cout << (*itPatient)->GetEntryValue(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)->GetEntry(0x0008, 0x1030) << std::endl; // Study Description + std::cout << "--- "<< (*itStudy)->GetEntryValue(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)->GetEntry(0x0008, 0x103e) << std::endl; // Serie Description + std::cout << "--- --- "<< (*itSerie)->GetEntryValue(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)->GetEntry(0x0004, 0x1500) << std::endl; // File name + while (itImage != (*itSerie)->GetDicomDirImages().end() ) { // on degouline les IMAGES de cette serie + std::cout << "--- --- --- "<< (*itImage)->GetEntryValue(0x0004, 0x1500) << std::endl; // File name ++itImage; } ++itSerie; @@ -154,11 +264,6 @@ int main(int argc, char* argv[]) */ -// cout << std::endl << std::endl -// << " = DICOMDIR full content ==========================================" -// << std::endl<< std::endl; -// e1->Print(); - if(e1->IsReadable()) std::cout <