Program: gdcm
Module: $RCSfile: PrintDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/01/17 11:01:55 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2005/06/07 11:12:10 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmTS.h"
#include "gdcmDebug.h"
+#include "gdcmArgMgr.h"
+
#include <fstream>
#include <iostream>
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' ",
+ FINISH_USAGE
+
+ // Initialize Arguments Manager
+ gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv);
+
+ if (argc == 1)
+ {
+ am->ArgMgrUsage(usage); // Display 'usage'
+ delete am;
+ return 0;
+ }
+
gdcm::DicomDir *e1;
gdcm::TSKey v;
gdcm::DicomDirSerie *se;
gdcm::DicomDirImage *im;
- std::string fileName;
- if (argc > 1)
- fileName = argv[1];
- else
- {
- fileName = GDCM_DATA_ROOT;
- fileName += "/DICOMDIR";
- }
+ char *fileName;
+ fileName = am->ArgMgrWantString("filein",usage);
+
+ 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 e1;
+ delete am;
+ return 0;
+ }
- if (argc > 3)
- gdcm::Debug::SetDebugOn();
+ // new style is useless, since it has no effect for *reading* a DICOMDIR
+ // (only meaningfull when *creating* a DICOMDIR)
e1 = new gdcm::DicomDir( fileName );
- e1->SetPrintLevel(2);
- int detailLevel;
- if (argc > 2)
- detailLevel = atoi(argv[2]);
- else
- detailLevel = 3;
+ //e1 = new gdcm::DicomDir();
+ //e1->SetParseDir(false);
+ //e1->Load( fileName );
// Test if the DicomDir is readable
if( !e1->IsReadable() )
return 1;
}
+ e1->SetPrintLevel(level);
+
// Test if the DicomDir contains any Patient
- e1->InitTraversal();
- pa = e1->GetNextEntry();
+ pa = e1->GetFirstPatient();
if ( pa == 0)
{
std::cout<<" DicomDir '"<<fileName
<< " = PATIENT List =========================================="
<< std::endl<< std::endl;
- e1->InitTraversal();
- pa = e1->GetNextEntry();
+ pa = e1->GetFirstPatient();
while (pa)
{
- std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
- pa = e1->GetNextEntry();
+ std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name
+ pa = e1->GetNextPatient();
}
break;
<< " = PATIENT/STUDY List ======================================="
<< std::endl<< std::endl;
- e1->InitTraversal();
- pa = e1->GetNextEntry();
- while ( pa ) // on degouline la liste de PATIENT
+ pa = e1->GetFirstPatient();
+ while ( pa ) // on degouline les PATIENT de ce DICOMDIR
{
- std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
- pa->InitTraversal();
- st = pa->GetNextEntry();
+ 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->GetEntry(0x0008, 0x1030) << std::endl; // Study Description
- st = pa->GetNextEntry();
+ std::cout << "--- "<< st->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description
+ st = pa->GetNextStudy();
}
- pa = e1->GetNextEntry();
+ pa = e1->GetNextPatient();
}
break;
<< " = PATIENT/STUDY/SERIE List =================================="
<< std::endl<< std::endl;
- e1->InitTraversal();
- pa = e1->GetNextEntry();
- while ( pa ) // 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:[" << pa->GetEntry(0x0010, 0x0010) <<"]"; // Patient's Name
+ std::cout << "Pat.Name:[" << pa->GetEntryValue(0x0010, 0x0010) <<"]"; // Patient's Name
std::cout << " Pat.ID:[";
- std::cout << pa->GetEntry(0x0010, 0x0020) << "]" << std::endl; // Patient ID
- pa->InitTraversal();
- st = pa->GetNextEntry();
+ 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->GetEntry(0x0008, 0x1030) << "]";// Study Description
- std::cout << " Stud.ID:[" << st->GetEntry(0x0020, 0x0010); // Study ID
+ std::cout << "--- Stud.descr:[" << st->GetEntryValue(0x0008, 0x1030) << "]";// Study Description
+ std::cout << " Stud.ID:[" << st->GetEntryValue(0x0020, 0x0010); // Study ID
std::cout << "]" << std::endl;
- st->InitTraversal();
- se = st->GetNextEntry();
+
+ se = st->GetFirstSerie();
while ( se ) { // on degouline les SERIES de cette study
- std::cout << "--- --- Ser.Descr:["<< se->GetEntry(0x0008, 0x103e)<< "]"; // Series Description
- std::cout << " Ser.nb:[" << se->GetEntry(0x0020, 0x0011); // Series number
- std::cout << "] Mod.:[" << se->GetEntry(0x0008, 0x0060) << "]"; // Modality
+ 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->GetNextEntry();
+ se = st->GetNextSerie();
}
- st = pa->GetNextEntry();
+ st = pa->GetNextStudy();
}
- pa = e1->GetNextEntry();
+ pa = e1->GetNextPatient();
}
break;
<< " = PATIENT/STUDY/SERIE/IMAGE List ============================"
<< std::endl<< std::endl;
- e1->InitTraversal();
- pa = e1->GetNextEntry();
- while ( pa ) { // on degouline la liste de PATIENT
- std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
- pa->InitTraversal();
- st = pa->GetNextEntry();
+ 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 << "--- "<< st->GetEntry(0x0008, 0x1030) << std::endl; // Study Description
- std::cout << " Stud.ID:[" << st->GetEntry(0x0020, 0x0010); // Study ID
- st->InitTraversal();
- se = st->GetNextEntry();
+ 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 << "--- --- "<< se->GetEntry(0x0008, 0x103e) << std::endl; // Serie Description
- std::cout << " Ser.nb:[" << se->GetEntry(0x0020, 0x0011); // Series number
- std::cout << "] Mod.:[" << se->GetEntry(0x0008, 0x0060) << "]"; // Modality
- se->InitTraversal();
- im = se->GetNextEntry();
+ 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->GetEntry(0x0004, 0x1500) << std::endl; // File name
- im = se->GetNextEntry();
+ std::cout << "--- --- --- "<< im->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
+ im = se->GetNextImage();
}
- se = st->GetNextEntry();
+ se = st->GetNextSerie();
}
- st = pa->GetNextEntry();
+ st = pa->GetNextStudy();
}
- pa = e1->GetNextEntry();
+ pa = e1->GetNextPatient();
}
break;
<< 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 IMAGES de cette serie
- std::cout << "--- --- --- "<< (*itImage)->GetEntry(0x0004, 0x1500) << std::endl; // File name
+ std::cout << "--- --- --- "<< (*itImage)->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
++itImage;
}
++itSerie;
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff