X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestPrintAllDocument.cxx;h=1b19d7949119d86f5ad1f0449dc826fa048bca12;hb=8cc5832cf333a9bfd128824d5864399d4a4313b7;hp=76215a247570bd4b0402b3f650865564a1b44409;hpb=bc69950a406d06c50f0fb75a96572784965cb534;p=gdcm.git diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx index 76215a24..1b19d794 100644 --- a/Testing/TestPrintAllDocument.cxx +++ b/Testing/TestPrintAllDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestPrintAllDocument.cxx,v $ Language: C++ - Date: $Date: 2005/10/18 08:35:46 $ - Version: $Revision: 1.9 $ + Date: $Date: 2006/04/07 10:58:51 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -38,7 +38,7 @@ //Generated file: #include "gdcmDataImages.h" -int TestPrintAllDocument(int, char *[]) +int TestPrintAllDocument(int argc, char *argv[]) { //std::ostringstream s; int i = 0; @@ -47,20 +47,33 @@ int TestPrintAllDocument(int, char *[]) std::string pixelType, photomInterp; int l; l = strlen("PALETTE COLOR "); + + //gdcm::Debug::DebugOn(); + while( gdcmDataImages[i] != 0 ) { - std::string filename = GDCM_DATA_ROOT; - filename += "/"; //doh! - filename += gdcmDataImages[i]; + std::string filename; + if (argc ==2) + { + filename = argv[1]; + } + else + { + filename = GDCM_DATA_ROOT; + filename += "/"; //doh! + filename += gdcmDataImages[i]; + } + + std::cout << " ----------------------------------------------" + << "Begin with " << filename << std::endl; - gdcm::File *f= new gdcm::File( ); + gdcm::File *f= gdcm::File::New( ); f->SetFileName( filename ); f->Load(); f->SetPrintLevel(2); f->Print(); - // just to be able to grep the display result, for some usefull info - + //s.setf(std::ios::left); //s << std::setw(60-filename.length()) << " "; //std::cout << s.str() << gdcmDataImages[i]; @@ -101,10 +114,12 @@ int TestPrintAllDocument(int, char *[]) f->GetEntryString(0x0020,0x0037); if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND ) { - gdcm::Orientation o; - gdcm::OrientationType orient = o.GetOrientationType( f ); + gdcm::Orientation *o = gdcm::Orientation::New(); + + gdcm::OrientationType orient = o->GetOrientationType( f ); std::cout << " ---------------------- Orientation " << orient << std::endl; + o->Delete(); } if( f->IsReadable() ) @@ -116,10 +131,14 @@ int TestPrintAllDocument(int, char *[]) { std::cout << filename << " is NOT Readable" << std::endl << std::endl; - delete f; + f->Delete(); return 1; } - delete f; + f->Delete(); + + if (argc ==2) + break; // user asked to check a single file. + i++; } return 0;