X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllReadCompareDicom.cxx;h=eea858b2d30e44499efdbcda2e3438e662fd636a;hb=aa74099d3b9e6bf860806305891414f048b7e9a0;hp=386a6ffb923d001891f0628cb5267924c75adf0a;hpb=220ad8c527f2b2edf1ba19af8897aca8f4a49cf7;p=gdcm.git diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx index 386a6ffb..eea858b2 100644 --- a/Testing/TestAllReadCompareDicom.cxx +++ b/Testing/TestAllReadCompareDicom.cxx @@ -1,17 +1,167 @@ +/*========================================================================= + + Program: gdcm + Module: $RCSfile: TestAllReadCompareDicom.cxx,v $ + Language: C++ + Date: $Date: 2005/01/11 15:58:36 $ + Version: $Revision: 1.23 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #include "gdcmHeader.h" #include "gdcmFile.h" +#include +#include + //Generated file: #include "gdcmDataImages.h" +int InternalTest(std::string const & filename, + std::string const & referenceFileName ) +{ + std::cout << " Testing: " << filename << std::endl; + + ////// Step 1: + std::cout << " 1..."; + gdcm::File* tested = new gdcm::File( filename ); + if( !tested->GetHeader()->IsReadable() ) + { + std::cout << " Failed" << std::endl + << " Image not gdcm compatible:" + << filename << std::endl; + delete tested; + return 1; + } + + ////// Step 2: + ////// Check for existence of reference baseline dicom file: + std::cout << "2..."; + + //FILE* testFILE = fopen( referenceFileName.c_str(), "r" ); + std::ifstream testFILE( referenceFileName.c_str() ); + if (! testFILE ) + { + uint8_t* testedImageData = tested->GetImageData(); // Kludge + (void)testedImageData; + + tested->SetWriteModeToRGB(); + tested->WriteDcmExplVR( referenceFileName ); + } + else + { + //fclose( testFILE ); + } + testFILE.close(); + + ////// Step 3a: + ////// When reference file is not gdcm readable test is failed: + std::cout << "3a..."; + + gdcm::File* reference = new gdcm::File( referenceFileName ); + if( !reference->GetHeader()->IsReadable() ) + { + std::cout << " Failed" << std::endl + << " reference image " + << referenceFileName + << " is not gdcm compatible." << std::endl; + delete tested; + delete reference; + return 1; + } + + std::string PixelType = reference->GetHeader()->GetPixelType(); + + ////// Step 3b: + std::cout << "3b..."; + int testedDataSize = tested->GetImageDataSize(); + uint8_t* testedImageData = tested->GetImageData(); + + int referenceDataSize = reference->GetImageDataSize(); + uint8_t* referenceImageData = reference->GetImageData(); + + // Test the image size + if (tested->GetHeader()->GetXSize() != reference->GetHeader()->GetXSize() || + tested->GetHeader()->GetYSize() != reference->GetHeader()->GetYSize() || + tested->GetHeader()->GetZSize() != reference->GetHeader()->GetZSize()) + { + std::cout << "Failed" << std::endl + << " Size differs: " + << "X: " << tested->GetHeader()->GetXSize() << " # " + << reference->GetHeader()->GetXSize() << " | " + << "Y: " << tested->GetHeader()->GetYSize() << " # " + << reference->GetHeader()->GetYSize() << " | " + << "Z: " << tested->GetHeader()->GetZSize() << " # " + << reference->GetHeader()->GetZSize() << std::endl; + delete reference; + delete tested; + return 1; + } + + // Test the data size + if (testedDataSize != referenceDataSize) + { + std::cout << " Failed" << std::endl + << " pixel (" + << PixelType + <<") areas lengths differ: " + << testedDataSize << " # " << referenceDataSize + << std::endl; + delete tested; + delete reference; + return 1; + } + + // Test the data content + if (int res = memcmp(testedImageData, referenceImageData, + testedDataSize) != 0 ) + { + (void)res; + std::cout << " Failed" << std::endl + << " pixel (" + << PixelType + << ") differ (as expanded in memory)." + << std::endl; + delete tested; + delete reference; + return 1; + } + + //////////////// Clean up: + delete tested; + delete reference; + + std::cout << "OK." << std::endl; + + return 0; +} + int TestAllReadCompareDicom(int argc, char* argv[]) { - if ( argc > 1 ) + if ( argc == 3 ) + { + // The test is specified a specific filename, use it instead of looping + // over all images + const std::string input = argv[1]; + const std::string reference = argv[2]; + return InternalTest( input, reference ); + } + else if ( argc > 3 || argc == 2 ) { std::cerr << " Usage: " << argv[0] << " (no arguments needed)." << std::endl; + std::cerr << "or Usage: " << argv[0] + << " filename.dcm reference.dcm" << std::endl; return 1; } + // else other cases: std::cout << " Description (Test::TestAllReadCompareDicom): " << std::endl; @@ -43,6 +193,7 @@ int TestAllReadCompareDicom(int argc, char* argv[]) << std::endl << std::endl; int i = 0; + int result = 0; while( gdcmDataImages[i] != 0 ) { ////// Check for existence of reference baseline directory @@ -50,8 +201,8 @@ int TestAllReadCompareDicom(int argc, char* argv[]) std::string baseLineDir = GDCM_DATA_ROOT; baseLineDir += "/BaselineDicom/"; - FILE* testFILE = fopen( baseLineDir.c_str(), "r" ); - if (! testFILE ) + std::ifstream* testDIR = new std::ifstream(baseLineDir.c_str(), std::ios::in | std::ios::binary); + if (!testDIR ) { std::cerr << " The reference baseline directory " << std::endl << " " @@ -62,30 +213,14 @@ int TestAllReadCompareDicom(int argc, char* argv[]) } else { - fclose( testFILE ); + testDIR->close(); } ////// Step 1 (see above description): - std::string filename = GDCM_DATA_ROOT; filename += "/"; filename += gdcmDataImages[i]; - - std::cout << " Testing: " << filename << std::endl; - - gdcmFile* tested = new gdcmFile( filename, false ); - if( !tested->GetHeader()->IsReadable() ) - { - std::cout << " Image not gdcm compatible:" - << filename << std::endl; - delete tested; - return 1; - } - - ////// Step 2: - - ////// Check for existence of reference baseline dicom file: - + std::string referenceFileName = baseLineDir + gdcmDataImages[i++]; std::string::size_type slash_pos = referenceFileName.rfind( "." ); if ( slash_pos != std::string::npos ) @@ -93,80 +228,11 @@ int TestAllReadCompareDicom(int argc, char* argv[]) referenceFileName.replace( slash_pos + 1, 3, "dcm" ); } - testFILE = fopen( referenceFileName.c_str(), "r" ); - if (! testFILE ) + if( InternalTest( filename, referenceFileName ) != 0 ) { - ////// Step 3a: - - int testedDataSize = tested->GetImageDataSize(); - (void)testedDataSize; - void* testedImageData = tested->GetImageData(); // Kludge - tested->WriteDcmExplVR( referenceFileName ); - std::cerr << " Creating reference baseline file :" << std::endl - << " " << referenceFileName - << std::endl; - delete tested; - delete (char*)testedImageData; - continue; - } - else - { - fclose( testFILE ); + result++; } - - ////// When reference file is not gdcm readable test is failed: - - gdcmFile* reference = new gdcmFile( referenceFileName.c_str(), false ); - if( !reference->GetHeader()->IsReadable() ) - { - std::cout << " Reference image " << std::endl - << " " << referenceFileName <GetImageDataSize(); - void* testedImageData = tested->GetImageData(); - - int referenceDataSize = reference->GetImageDataSize(); - void* referenceImageData = reference->GetImageData(); - - if (testedDataSize != referenceDataSize) - { - std::cout << " Pixel areas lengths differ: " - << testedDataSize << " # " << referenceDataSize - << std::endl; - delete tested; - delete reference; - delete (char*)testedImageData; - delete (char*)referenceImageData; - return 1; - } - - if (int res = memcmp(testedImageData, referenceImageData, - testedDataSize) != 0 ) - { - (void)res; - std::cout << " Pixel differ (as expanded in memory)." - << std::endl; - delete tested; - delete reference; - delete (char*)testedImageData; - delete (char*)referenceImageData; - return 1; - } - std::cout << " Passed." << std::endl ; - - //////////////// Clean up: - delete tested; - delete reference; - delete (char*)testedImageData; - delete (char*)referenceImageData; } - return 0; + return result; }