X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintDicomDir.cxx;h=145d33dd01f948dee8abb25f42dbeecb370baafb;hb=d37154e4495e1e1c18c44f6cae6ef2ff8a2891cf;hp=f8abf2826c3804ef13384615a2f9b9076e39b810;hpb=fedc986e59dfb729af7bcd2e3bfd2b73c021be01;p=gdcm.git diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx index f8abf282..145d33dd 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/06/08 08:09:07 $ - Version: $Revision: 1.23 $ + Date: $Date: 2007/05/23 14:18:04 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,11 +17,12 @@ =========================================================================*/ #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 "gdcmDicomDirPrivate.h" #include "gdcmTS.h" #include "gdcmDebug.h" @@ -33,33 +34,35 @@ int main(int argc, char* argv[]) { 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' ", + " \n PrintDicomDir :\n ", + " Display the tree-like structure of a DICOMDIR File ", + " usage: PrintDicomDir filein=fileName [level=n][detail=m][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) ", + " warning : user wants to run the program in 'warning mode' ", + " debug : developper wants to run the program in 'debug mode' ", FINISH_USAGE // Initialize Arguments Manager - gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv); + GDCM_NAME_SPACE::ArgMgr *am= new GDCM_NAME_SPACE::ArgMgr(argc, argv); - if (argc == 1) + if (argc == 1 || am->ArgMgrDefined("usage") ) { 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; - + GDCM_NAME_SPACE::DicomDir *f; + GDCM_NAME_SPACE::TSKey v; + + GDCM_NAME_SPACE::DicomDirPatient *pa; + GDCM_NAME_SPACE::DicomDirStudy *st; + GDCM_NAME_SPACE::DicomDirSerie *se; + GDCM_NAME_SPACE::DicomDirVisit *vs; + GDCM_NAME_SPACE::DicomDirImage *im; + GDCM_NAME_SPACE::DicomDirPrivate *pr; char *fileName; fileName = am->ArgMgrWantString("filein",usage); @@ -68,8 +71,11 @@ int main(int argc, char* argv[]) int detailLevel = am->ArgMgrGetInt("detail", 2); if (am->ArgMgrDefined("debug")) - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); + if (am->ArgMgrDefined("warning")) + GDCM_NAME_SPACE::Debug::WarningOn(); + /* if unused Param we give up */ if ( am->ArgMgrPrintUnusedLabels() ) { @@ -78,153 +84,202 @@ 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) - - e1 = new gdcm::DicomDir( fileName ); + // new gdcm2 style - //e1 = new gdcm::DicomDir(); - //e1->SetParseDir(false); - //e1->Load( fileName ); + f = GDCM_NAME_SPACE::DicomDir::New(); + f->SetFileName ( fileName ); + f->Load( ); // Test if the DicomDir is readable - if( !e1->IsReadable() ) + if( !f->IsReadable() ) { std::cout<<" DicomDir '"<Delete(); return 1; } - e1->SetPrintLevel(level); + f->SetPrintLevel(level); // Test if the DicomDir contains any Patient - pa = e1->GetFirstPatient(); - if ( pa == 0) + pa = f->GetFirstPatient(); + 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 = e1->GetFirstPatient(); - while (pa) - { - std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name - pa = e1->GetNextPatient(); - } - break; - - case 2: - std::cout << std::endl << std::endl - << " = PATIENT/STUDY List =======================================" - << std::endl<< std::endl; - - 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(); + { + 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 = e1->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 << " Stud.Inst.UID:[" << st->GetEntryString(0x0020, 0x000d) << "]"; // Study Instance UID + 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 << " Stud.Inst.UID:[" << st->GetEntryString(0x0020, 0x000d) << "]"; // Study Instance UID + 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 << " Serie Inst.UID.:[" << se->GetEntryString(0x0020, 0x000e) << "]"; // Series Instance UID + 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 = e1->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 = e1->GetNextPatient(); - } - break; - - case 4: - std::cout << std::endl << std::endl - << " = PATIENT/STUDY/SERIE/IMAGE List ============================" - << std::endl<< std::endl; + 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 << " Stud.Inst.UID:[" << st->GetEntryString(0x0020, 0x000d) << "]"; // Study Instance UID + 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->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 << " Serie Inst.UID.:[" << se->GetEntryString(0x0020, 0x000e) << "]"; // Series Instance UID + 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(); + } + + pr = se->GetFirstPrivate(); + while ( pr ) + { // on degouline les 'Privates' de cette serie + std::cout << "--- --- --- "<< " PRIVATE Ref. File ID :[" << pr->GetEntryString(0x0004, 0x1500) + << "]" << std::endl; // File name (Referenced File ID) + pr = se->GetNextPrivate(); + } - 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(); } - se = st->GetNextSerie(); - } - st = pa->GetNextStudy(); - } - pa = e1->GetNextPatient(); - } - break; - - case 5: - std::cout << std::endl << std::endl - << " = DICOMDIR full content ==========================================" - << std::endl<< std::endl; - e1->Print(); - break; + 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 @@ -233,26 +288,26 @@ int main(int argc, char* argv[]) // 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; + GDCM_NAME_SPACE::ListDicomDirPatient::const_iterator itPatient; + GDCM_NAME_SPACE::ListDicomDirStudy::const_iterator itStudy; + GDCM_NAME_SPACE::ListDicomDirSerie::const_iterator itSerie; + GDCM_NAME_SPACE::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 les PATIENT de ce DICOMDIR - std::cout << (*itPatient)->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name + itPatient = f->GetDicomDirPatients().begin(); + while ( itPatient != f->GetDicomDirPatients().end() ) { // on degouline les PATIENT de ce DICOMDIR + 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; @@ -264,12 +319,12 @@ int main(int argc, char* argv[]) */ - if(e1->IsReadable()) + if(f->IsReadable()) std::cout <Delete(); return(0); }