X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=886120b3b6076f19fa162ad3a4d6b3c98e7d538c;hb=eacd2efd90ffb9015d6358f135cb17a838a29abb;hp=ea6b686eeaa598395a1c46dc1ff1a424078f1887;hpb=aaeee7164728ec0749a525f0c74274865712ec37;p=gdcm.git diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx index ea6b686e..886120b3 100644 --- a/Testing/TestDicomDir.cxx +++ b/Testing/TestDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/01/24 16:10:50 $ - Version: $Revision: 1.32 $ + Date: $Date: 2005/10/18 08:35:46 $ + Version: $Revision: 1.41 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,6 +16,7 @@ =========================================================================*/ #include "gdcmDocEntry.h" +#include "gdcmDataEntry.h" #include "gdcmDicomDir.h" #include "gdcmDicomDirPatient.h" #include "gdcmDicomDirStudy.h" @@ -26,14 +27,67 @@ #include #include -int TestDicomDir(int argc, char* argv[]) +// check *all* the dicom elements (gdcm::DocEntry) +// of this gdcm::DicomDirObject +int CompareSQItem(gdcm::SQItem *pa1, gdcm::SQItem *pa2 ) +{ + gdcm::DocEntry *e1; + gdcm::DocEntry *e2; + + e2 = pa2->GetFirstEntry(); + while (!e2) + { + // locate the corresponding element in 'source' file + e1 = pa1->GetDocEntry( e2->GetGroup(),e2->GetElement() ); + + // an element doesn't exist in origin file + if (!e1) + { + std::cout << "DicomDir element " << std::hex + << e2->GetGroup() << "," <GetElement() << std::endl; + return 1; + } + // skip SeqEntries (I don't want to deal with 'recursion pbs' here) + if ( !dynamic_cast(e1) || + !dynamic_cast(e2) ) + continue; + + // a value is read as GDCM_UNFOUND + if ( ((gdcm::DataEntry *)e1)->GetString() == gdcm::GDCM_UNFOUND ) + { + std::cout << "for gdcm source DicomDir : element (" << std::hex + << e1->GetGroup() << "," <GetElement() + << ") has values [" << gdcm::GDCM_UNFOUND << "]" + << std::endl; + return 1; + } + + // values differ in source file and destination file + if ( ((gdcm::DataEntry *)e1)->GetString() != + ((gdcm::DataEntry *)e2)->GetString() ) + { + + // serious trouble : values differ in source and destination file + std::cout << "for gdcm DicomDir element (" << std::hex + << e2->GetGroup() << "," <GetElement() + << ") values differ [" + << ((gdcm::DataEntry *)e1)->GetString() << "] != [" + << ((gdcm::DataEntry *)e2)->GetString() << "]" + << std::endl; + return 1; + } + } + return 0; +} + +int TestDicomDir(int argc, char *argv[]) { - gdcm::DicomDir *e1; + gdcm::DicomDir *dicomdir; - gdcm::DicomDirPatient *pa; - gdcm::DicomDirStudy *st; - gdcm::DicomDirSerie *se; - gdcm::DicomDirImage *im; + gdcm::DicomDirPatient *pa1; + gdcm::DicomDirStudy *st1; + gdcm::DicomDirSerie *se1; + gdcm::DicomDirImage *im1; gdcm::TSKey v; @@ -46,21 +100,23 @@ int TestDicomDir(int argc, char* argv[]) file += "/DICOMDIR"; } - e1 = new gdcm::DicomDir(file); + dicomdir = new gdcm::DicomDir( ); + dicomdir->SetFileName(file); + dicomdir->Load( ); if (argc > 2) { int level = atoi(argv[2]); - e1->SetPrintLevel(level); + dicomdir->SetPrintLevel(level); } // Test if the DicomDir is readable - if( !e1->IsReadable() ) + if( !dicomdir->IsReadable() ) { std::cout<<" DicomDir '"<GetFirstPatient() ) + // Test if the DicomDir contains any patient + if( !dicomdir->GetFirstPatient() ) { std::cout<<" DicomDir '"<GetFirstPatient(); - while ( pa ) + + pa1 = dicomdir->GetFirstPatient(); + while ( pa1 ) { // we process all the PATIENT of this DICOMDIR - std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name + std::cout << pa1->GetEntryString(0x0010, 0x0010) << std::endl; // Patient's Name - st = pa->GetFirstStudy(); - while ( st ) + st1 = pa1->GetFirstStudy(); + while ( st1 ) { // we process all the STUDY of this patient - std::cout << "--- "<< st->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description - std::cout << " Stud.ID:[" << st->GetEntryValue(0x0020, 0x0010); // Study ID + std::cout << "--- "<< st1->GetEntryString(0x0008, 0x1030) // Study Description + << std::endl; + std::cout << " Stud.ID:[" << st1->GetEntryString(0x0020, 0x0010) // Study ID + << "]"; - se = st->GetFirstSerie(); - while ( se ) + se1 = st1->GetFirstSerie(); + while ( se1 ) { // we process all the SERIES of this study - std::cout << "--- --- "<< se->GetEntryValue(0x0008, 0x103e) << std::endl; // Serie Description - std::cout << " Ser.nb:[" << se->GetEntryValue(0x0020, 0x0011); // Series number - std::cout << "] Mod.:[" << se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality - - im = se->GetFirstImage(); - while ( im ) { // we process all the IMAGE of this serie - std::cout << "--- --- --- "<< im->GetEntryValue(0x0004, 0x1500) << std::endl; // File name - im = se->GetNextImage(); + std::cout << "--- --- "<< se1->GetEntryString(0x0008, 0x103e) << std::endl; // Serie Description + std::cout << " Ser.nb:[" << se1->GetEntryString(0x0020, 0x0011); // Series number + std::cout << "] Mod.:[" << se1->GetEntryString(0x0008, 0x0060) << "]"; // Modality + + im1 = se1->GetFirstImage(); + while ( im1 ) { // we process all the IMAGE of this serie + std::cout << "--- --- --- "<< im1->GetEntryString(0x0004, 0x1500) << std::endl; // File name + im1 = se1->GetNextImage(); } - se = st->GetNextSerie(); + se1 = st1->GetNextSerie(); } - st = pa->GetNextStudy(); - } - pa = e1->GetNextPatient(); + st1 = pa1->GetNextStudy(); + } + pa1 = dicomdir->GetNextPatient(); } std::cout << std::endl << std::endl << " = DICOMDIR full content ====================================" << std::endl<< std::endl; - e1->Print(); + // dicomdir->Print(); + + // ------------------------- second stage --------------------------- + + // Write on disc what we read + dicomdir->Write("NewDICOMDIR"); + + std::cout << std::endl << std::endl + << "NewDICOMDIR written on disc =================================" + << std::endl<< std::endl; + // Read what we wrote + gdcm::DicomDir *d2 = new gdcm::DicomDir( ); + d2->SetFileName("NewDICOMDIR"); + d2->Load( ); + if (!d2->IsReadable( )) + { + std::cout << std::endl << std::endl + << "Read NewDicomDir from disc failed ========================" + << std::endl<< std::endl; + return 1; + } + std::cout << std::endl << std::endl + << "NewDICOMDIR successfully read from disc =================================" + << std::endl<< std::endl; + + gdcm::DicomDirPatient *pa2; + gdcm::DicomDirStudy *st2; + gdcm::DicomDirSerie *se2; + gdcm::DicomDirImage *im2; + + pa1 = dicomdir->GetFirstPatient(); + pa2 = d2->GetFirstPatient(); + + if (!d2) + { + std::cout << "NewDICOMDIR contains no Patient ?!?" << std::endl; + delete dicomdir; + delete d2; + return 1; + } + + while ( pa1 && pa2 ) + { // we process all the PATIENT of this DICOMDIR + + if ( CompareSQItem(pa2,pa1) == 1 ) + { + delete dicomdir; + delete d2; + return 1; + } + + // just to allow human reader to be sure ... + std::cout << pa2->GetEntryString(0x0010, 0x0010) + << std::endl; // Patient's Name + + st1 = pa1->GetFirstStudy(); + st2 = pa2->GetFirstStudy(); + + while ( st1 && st2 ) + { + if ( CompareSQItem(st2,st1) == 1 ) + { + delete dicomdir; + delete d2; + return 1; + } + + // just to allow human reader to be sure ... + std::cout << "--- "<< st2->GetEntryString(0x0008, 0x1030); + // << std::endl; // Study Description + std::cout << " Stud.ID:[" + << st2->GetEntryString(0x0020, 0x0010) + << "]" << std::endl; // Study ID + + se1 = st1->GetFirstSerie(); + se2 = st2->GetFirstSerie(); + + while ( se1 && se2 ) + { // we process all the SERIE of this study + if ( CompareSQItem(se2,se1) == 1 ) + return 1; + std::cout << "--- --- " << se2->GetEntryString(0x0008, 0x103e); // Serie Description + std::cout << " Ser.nb:["<< se2->GetEntryString(0x0020, 0x0011); // Series number + std::cout << "] Mod.:[" << se2->GetEntryString(0x0008, 0x0060) << "]" << std::endl; // Modality + im1 = se1->GetFirstImage(); + im2 = se2->GetFirstImage(); + + while ( im1 && im2 ) // we process all the IMAGE of this serie + { + if ( CompareSQItem(im2,im1) == 1 ) + { + delete dicomdir; + delete d2; + return 1; + } + + im1 = se1->GetNextImage(); + im2 = se2->GetNextImage(); + } + se1 = st1->GetNextSerie(); + se2 = st2->GetNextSerie(); + } + st1 = pa1->GetNextStudy(); + st2 = pa2->GetNextStudy(); + } + pa1 = dicomdir->GetNextPatient(); + pa2 = dicomdir->GetNextPatient(); + } - std::cout<