Program: gdcm
Module: $RCSfile: PrintDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/06/08 08:09:07 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2005/07/21 04:55:50 $
+ Version: $Revision: 1.28 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmValEntry.h"
#include "gdcmDicomDirPatient.h"
#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirVisit.h"
#include "gdcmDicomDirSerie.h"
#include "gdcmDicomDirImage.h"
#include "gdcmTS.h"
// 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;
return 0;
}
- gdcm::DicomDir *e1;
+ gdcm::DicomDir *f;
gdcm::TSKey v;
gdcm::DicomDirPatient *pa;
gdcm::DicomDirStudy *st;
gdcm::DicomDirSerie *se;
+ gdcm::DicomDirVisit *vs;
gdcm::DicomDirImage *im;
char *fileName;
return 0;
}
- // new style is useless, since it has no effect for *reading* a DICOMDIR
- // (only meaningfull when *creating* a DICOMDIR)
+ // new gdcm2 style
- e1 = new gdcm::DicomDir( fileName );
-
- //e1 = new gdcm::DicomDir();
- //e1->SetParseDir(false);
- //e1->Load( fileName );
+ f = new gdcm::DicomDir();
+ f->SetFileName ( fileName );
+ f->Load( );
// Test if the DicomDir is readable
- if( !e1->IsReadable() )
+ if( !f->IsReadable() )
{
std::cout<<" DicomDir '"<<fileName
<<"' is not readable"<<std::endl
<<" ...Failed"<<std::endl;
- delete e1;
+ delete f;
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 '"<<fileName
<<" has no patient"<<std::endl
<<" ...Failed"<<std::endl;
- delete e1;
+ delete f;
return 1;
}
<< " = PATIENT List =========================================="
<< std::endl<< std::endl;
- pa = e1->GetFirstPatient();
+ pa = f->GetFirstPatient();
while (pa)
{
- std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name
- pa = e1->GetNextPatient();
+ 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
+ pa = f->GetNextPatient();
}
break;
<< " = PATIENT/STUDY List ======================================="
<< std::endl<< std::endl;
- pa = e1->GetFirstPatient();
+ pa = f->GetFirstPatient();
while ( pa ) // on degouline les PATIENT de ce DICOMDIR
{
- std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name
-
+ 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->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description
+ 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 = pa->GetNextStudy();
}
- pa = e1->GetNextPatient();
+ pa = f->GetNextPatient();
}
break;
<< " = PATIENT/STUDY/SERIE List =================================="
<< std::endl<< std::endl;
- pa = e1->GetFirstPatient();
+ pa = f->GetFirstPatient();
while ( pa ) // on degouline les PATIENT de ce DICOMDIR
{
// Patient's Name, 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;
+ 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 << " Ser.nb:[" << se->GetEntryValue(0x0020, 0x0011); // Series number
+ std::cout << "] Mod.:[" << se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality
std::cout << std::endl;
se = st->GetNextSerie();
}
+
+ vs = st->GetFirstVisit();
+ while ( vs ) { // on degouline les VISIT de cette study
+ std::cout << "--- --- VISIT: ";
+ std::cout << " Ref. File ID :[" << vs->GetEntryValue(0x0004, 0x1500) << "]"; // Referenced File ID
+ std::cout << " Inst.Name:[" << vs->GetEntryValue(0x0008,0x0080) << "]"; // Institution Name
+ std::cout << " Adm.ID:[" << vs->GetEntryValue(0x0038, 0x0010) << "]"; // Admission ID
+ std::cout << " Adm. date:[" << vs->GetEntryValue(0x0038, 0x0020) << "]"; // Admitting Date
+ std::cout << std::endl;
+ vs = st->GetNextVisit();
+ }
+
st = pa->GetNextStudy();
}
- pa = e1->GetNextPatient();
+ pa = f->GetNextPatient();
}
break;
<< " = PATIENT/STUDY/SERIE/IMAGE List ============================"
<< std::endl<< std::endl;
- pa = e1->GetFirstPatient();
+ 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
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;
+ std::cout << "--- Stud.descr:[" << st->GetEntryValue(0x0008, 0x1030) << "]"; // Study Description
+ std::cout << " Stud.ID:[" << st->GetEntryValue(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->GetEntryValue(0x0004, 0x1500) << "]"; // Referenced File ID
+ std::cout << " Inst.Name:[" << vs->GetEntryValue(0x0008,0x0080) << "]"; // Institution Name
+ std::cout << " Adm.ID:[" << vs->GetEntryValue(0x0038, 0x0010) << "]"; // Admission ID
+ std::cout << " Adm. date:[" << vs->GetEntryValue(0x0038, 0x0020) << "]"; // Admitting Date
+ std::cout << std::endl;
+ vs = st->GetNextVisit();
+ }
se = st->GetFirstSerie();
while ( se ) { // on degouline les SERIES de cette study
im = se->GetFirstImage();
while ( im ) { // on degouline les Images de cette serie
- std::cout << "--- --- --- "<< im->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
+ std::cout << "--- --- --- "<< " IMAGE Ref. File ID :[" << im->GetEntryValue(0x0004, 0x1500)
+ << "]" << std::endl; // File name (Referenced File ID)
im = se->GetNextImage();
}
se = st->GetNextSerie();
}
st = pa->GetNextStudy();
}
- pa = e1->GetNextPatient();
+ pa = f->GetNextPatient();
}
break;
std::cout << std::endl << std::endl
<< " = DICOMDIR full content =========================================="
<< std::endl<< std::endl;
- e1->Print();
+ f->Print();
break;
} // end switch
<< " = 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
+ 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
itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient
*/
- if(e1->IsReadable())
+ if(f->IsReadable())
std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
else
std::cout <<std::endl<<fileName<<" is NOT Readable"<<std::endl;
std::cout<<std::flush;
- delete e1;
+ delete f;
return(0);
}