From 336bf4a855ae72cfa933510e0f4b731c42ca33cf Mon Sep 17 00:00:00 2001 From: jpr Date: Wed, 5 Sep 2007 09:55:01 +0000 Subject: [PATCH] Refine testing --- Testing/TestReadWriteJPEG2000ReadCompare.cxx | 23 ++- Testing/TestReadWriteJPEGReadCompare.cxx | 62 ++++--- Testing/TestReadWriteReadCompare.cxx | 180 +++++++++++++++---- 3 files changed, 190 insertions(+), 75 deletions(-) diff --git a/Testing/TestReadWriteJPEG2000ReadCompare.cxx b/Testing/TestReadWriteJPEG2000ReadCompare.cxx index d5e30aba..a389e528 100755 --- a/Testing/TestReadWriteJPEG2000ReadCompare.cxx +++ b/Testing/TestReadWriteJPEG2000ReadCompare.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestReadWriteJPEG2000ReadCompare.cxx,v $ Language: C++ - Date: $Date: 2007/09/04 14:44:45 $ - Version: $Revision: 1.5 $ + Date: $Date: 2007/09/05 09:55:01 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -150,7 +150,6 @@ static int CompareInternalJPEG2000(std::string const &filename, std::string cons } // Test the data content - unsigned int j =0; unsigned int nbDiff =0; @@ -168,7 +167,7 @@ static int CompareInternalJPEG2000(std::string const &filename, std::string cons if (nbDiff!=0) { std::cout << std::endl << filename << " Failed : " - << nbDiff/(file->GetBitsAllocated()/8) << " pixels -amongst " + << nbDiff/(file->GetBitsAllocated()/8) << " Pixels -amongst " << dataSizeFixed/(file->GetBitsAllocated()/8) << "- (" << PixelType << " bAlloc:" << file->GetBitsAllocated() << " bStored:" << file->GetBitsStored() << ") differ (as expanded in memory)." @@ -201,8 +200,8 @@ static int CompareInternalJPEG2000(std::string const &filename, std::string cons reread->Delete(); nb_of_failure2000___++; - if (nbDiff>1) // last pixel of (DermaColorLossLess.dcm) is diferent. ?!? - // I don't want it to break the testsuite + if (nbDiff/2 > 8 ) // last pixel of (DermaColorLossLess.dcm) is diferent. ?!? + // I don't want it to break the testsuite return 1; else return 0; @@ -291,12 +290,20 @@ int TestReadWriteJPEG2000ReadCompare(int argc, char *argv[]) << " match (as expanded by gdcm)." << std::endl; int i = 0; + int res =0; while( gdcmDataImages[i] != 0 ) { std::string filename = GDCM_DATA_ROOT; filename += "/"; - filename += gdcmDataImages[i++]; - result += CompareInternalJPEG2000(filename, "TestReadWriteJPEG2000ReadCompare.dcm"); + filename += gdcmDataImages[i]; + res = CompareInternalJPEG2000(filename, "TestReadWriteJPEG2000ReadCompare.dcm"); + + if (res == 1) + { + std::cout << "=============================== Failure on: " << gdcmDataImages[i] << std::endl; + result ++; + } + i ++; } } std::cout << "==================================" << std::endl; diff --git a/Testing/TestReadWriteJPEGReadCompare.cxx b/Testing/TestReadWriteJPEGReadCompare.cxx index 8217491b..511b84bf 100755 --- a/Testing/TestReadWriteJPEGReadCompare.cxx +++ b/Testing/TestReadWriteJPEGReadCompare.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestReadWriteJPEGReadCompare.cxx,v $ Language: C++ - Date: $Date: 2007/09/04 14:44:45 $ - Version: $Revision: 1.9 $ + Date: $Date: 2007/09/05 09:55:01 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,9 +28,9 @@ const unsigned int MAX_NUMBER_OF_DIFFERENCE = 10; -int nb_of_success___; -int nb_of_failure___; -int nb_of_diffPM1___; +int nb_of_successJPEG___; +int nb_of_failureJPEG___; +int nb_of_diffPM1JPEG___; static int CompareInternalJPEG(std::string const &filename, std::string const &output) { std::cout << "----------------------------------------------------------------------" << std::endl @@ -47,7 +47,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o << "Test::TestReadWriteJPEGReadCompare: Image not gdcm compatible:" << filename << std::endl; file->Delete(); - nb_of_failure___++; + nb_of_failureJPEG___++; return 1; } std::cout << " step 1..."; @@ -61,13 +61,13 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o // (even if we do it by setting a flag, *he* will have to decide) //filehelper->SetImageData(imageData, dataSize); - - filehelper->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE); // lossless compression : pixels reain unimpared - filehelper->SetWriteModeToRaw(); - filehelper->SetWriteTypeToJPEG( ); - + + filehelper->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE); // lossless compression : pixels remain unimpared + filehelper->SetWriteModeToRaw(); + filehelper->SetWriteTypeToJPEG( ); + filehelper->SetUserData(imageData,dataSize); // This one ensures the compression - filehelper->Write( output ); + filehelper->Write( output ); std::cout << "2..."; @@ -84,11 +84,10 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o file->Delete(); filehelper->Delete(); fileout->Delete(); - nb_of_failure___++; + nb_of_failureJPEG___++; return 1; } - if ( file->GetBitsAllocated()>16 ) { std::cout << "=============== 32 bits, not checked...OK." << std::endl ; @@ -99,7 +98,6 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o return 0; } - GDCM_NAME_SPACE::FileHelper *reread = GDCM_NAME_SPACE::FileHelper::New( fileout ); std::cout << "3..."; @@ -125,7 +123,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o filehelper->Delete(); fileout->Delete(); reread->Delete(); - nb_of_failure___++; + nb_of_failureJPEG___++; return 1; } @@ -133,7 +131,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o // beware of odd length Pixel Element! if (dataSize != dataSizeWritten) std::cout << std::endl << "dataSize:" << dataSize << " dataSizeWritten:" << dataSizeWritten << std::endl; - + int dataSizeFixed = dataSize - dataSize%2; int dataSizeWrittenFixed = dataSizeWritten - dataSizeWritten%2; @@ -146,16 +144,15 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o filehelper->Delete(); fileout->Delete(); reread->Delete(); - nb_of_failure___++; + nb_of_failureJPEG___++; return 1; } // Test the data content - - unsigned int j =0; - unsigned int nbDiff =0; + unsigned int j = 0; + unsigned int nbDiff = 0; if (memcmp(imageData, imageDataWritten, dataSizeFixed) !=0) - { + { std::string PixelType = filehelper->GetFile()->GetPixelType(); std::string ts = filehelper->GetFile()->GetTransferSyntax(); @@ -199,10 +196,10 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o filehelper->Delete(); fileout->Delete(); reread->Delete(); - nb_of_failure___++; + nb_of_failureJPEG___++; if (nbDiff/2 > 8 ) // last pixel of (DermaColorLossLess.dcm) is diferent. ?!? - // I don't want it to break the testsuite + // I don't want it to break the testsuite return 1; else return 0; @@ -233,12 +230,12 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o } } std::cout << std::endl; - nb_of_diffPM1___++; + nb_of_diffPM1JPEG___++; } } else { - nb_of_success___ ++; + nb_of_successJPEG___ ++; } std::cout << "=============== 4...OK." << std::endl ; //////////////// Clean up: @@ -255,9 +252,9 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o int TestReadWriteJPEGReadCompare(int argc, char *argv[]) { int result = 0; - nb_of_success___ = 0; - nb_of_failure___ = 0; -// nb_of_diffPM1___ = 0; + nb_of_successJPEG___ = 0; + nb_of_failureJPEG___ = 0; + nb_of_diffPM1JPEG___ = 0; if (argc == 4) GDCM_NAME_SPACE::Debug::DebugOn(); @@ -298,6 +295,7 @@ int TestReadWriteJPEGReadCompare(int argc, char *argv[]) filename += "/"; filename += gdcmDataImages[i]; res = CompareInternalJPEG(filename, "TestReadWriteJPEGReadCompare.dcm"); + if (res == 1) { std::cout << "=============================== Failure on: " << gdcmDataImages[i] << std::endl; @@ -307,8 +305,8 @@ int TestReadWriteJPEGReadCompare(int argc, char *argv[]) } } std::cout << "==================================" << std::endl; - std::cout << "nb of success " << nb_of_success___ << std::endl; - std::cout << "nb of failure " << nb_of_failure___ << std::endl; -// std::cout << "nb of diff+/-1 " << nb_of_diffPM1___ << std::endl; + std::cout << "nb of success " << nb_of_successJPEG___ << std::endl; + std::cout << "nb of failure " << nb_of_failureJPEG___ << std::endl; + std::cout << "nb of diff+/-1 " << nb_of_diffPM1JPEG___ << std::endl; return result; } diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx index 3de35a99..af05b397 100644 --- a/Testing/TestReadWriteReadCompare.cxx +++ b/Testing/TestReadWriteReadCompare.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestReadWriteReadCompare.cxx,v $ Language: C++ - Date: $Date: 2007/09/04 13:02:45 $ - Version: $Revision: 1.33 $ + Date: $Date: 2007/09/05 09:55:02 $ + Version: $Revision: 1.34 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,12 +19,21 @@ #include "gdcmFileHelper.h" #include "gdcmDebug.h" +#include "gdcmGlobal.h" +#include "gdcmTS.h" + //Generated file: #include "gdcmDataImages.h" -int CompareInternal(std::string const &filename, std::string const &output) +const unsigned int MAX_NUMBER_OF_DIFFERENCE = 10; + +int nb_of_success___; +int nb_of_failure___; +int nb_of_diffPM1___; +static int CompareInternal(std::string const &filename, std::string const &output) { - std::cout << " Testing: " << filename << std::endl; + std::cout << "----------------------------------------------------------------------" << std::endl + << " Testing: " << filename << std::endl; //////////////// Step 1 (see above description): @@ -37,14 +46,14 @@ int CompareInternal(std::string const &filename, std::string const &output) << "Test::TestReadWriteReadCompare: Image not gdcm compatible:" << filename << std::endl; file->Delete(); + nb_of_failure___++; return 1; } std::cout << " step 1..."; - std::cout << "--- End of Reading \n"; - + //////////////// Step 2: GDCM_NAME_SPACE::FileHelper *filehelper = GDCM_NAME_SPACE::FileHelper::New( file ); - int dataSize = filehelper->GetImageDataSize(); + int dataSize = filehelper->GetImageDataSize(); uint8_t *imageData = filehelper->GetImageData(); //EXTREMELY IMPORTANT // Sure, it is : It's up to the user to decide if he wants to // GetImageData or if he wants to GetImageDataRaw @@ -52,16 +61,18 @@ int CompareInternal(std::string const &filename, std::string const &output) //filehelper->SetImageData(imageData, dataSize); - filehelper->SetWriteModeToRGB(); - filehelper->WriteDcmExplVR( output ); + filehelper->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE); // pixels remain unimpared + filehelper->SetWriteModeToRGB( ); + + filehelper->SetUserData(imageData,dataSize); // This one ensures the compression + filehelper->Write( output ); + std::cout << "2..."; - std::cout << "--- End of Writting \n"; - + //////////////// Step 3: GDCM_NAME_SPACE::File *fileout = GDCM_NAME_SPACE::File::New(); fileout->SetFileName( output ); fileout->Load(); - // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated if( !fileout->IsReadable() ) { @@ -71,17 +82,17 @@ int CompareInternal(std::string const &filename, std::string const &output) file->Delete(); filehelper->Delete(); fileout->Delete(); + nb_of_failure___++; return 1; } - std::cout << "--- End of Re-Reading \n"; + GDCM_NAME_SPACE::FileHelper *reread = GDCM_NAME_SPACE::FileHelper::New( fileout ); std::cout << "3..."; // For the next step: - int dataSizeWritten = reread->GetImageDataSize(); + int dataSizeWritten = reread->GetImageDataSize(); uint8_t *imageDataWritten = reread->GetImageData(); - std::cout << "--- End of GetImageData \n"; - + //////////////// Step 4: // Test the image size if (file->GetXSize() != reread->GetFile()->GetXSize() || @@ -89,7 +100,7 @@ int CompareInternal(std::string const &filename, std::string const &output) file->GetZSize() != reread->GetFile()->GetZSize()) { std::cout << "Failed" << std::endl - << " X Size differs: " + << " Size differs: " << "X: " << file->GetXSize() << " # " << reread->GetFile()->GetXSize() << " | " << "Y: " << file->GetYSize() << " # " @@ -100,13 +111,17 @@ int CompareInternal(std::string const &filename, std::string const &output) filehelper->Delete(); fileout->Delete(); reread->Delete(); + nb_of_failure___++; return 1; } // Test the data size // beware of odd length Pixel Element! - int dataSizeFixed = dataSize + dataSize%2; - int dataSizeWrittenFixed = dataSizeWritten + dataSizeWritten%2; + if (dataSize != dataSizeWritten) + std::cout << std::endl << "dataSize:" << dataSize << " dataSizeWritten:" << dataSizeWritten << std::endl; + + int dataSizeFixed = dataSize - dataSize%2; + int dataSizeWrittenFixed = dataSizeWritten - dataSizeWritten%2; if (dataSizeFixed != dataSizeWrittenFixed) { @@ -117,22 +132,100 @@ int CompareInternal(std::string const &filename, std::string const &output) filehelper->Delete(); fileout->Delete(); reread->Delete(); + nb_of_failure___++; return 1; } - // Test the data's content - if (memcmp(imageData, imageDataWritten, dataSize) !=0) + // Test the data content + unsigned int j = 0; + unsigned int nbDiff = 0; + if (memcmp(imageData, imageDataWritten, dataSizeFixed) !=0) { - std::cout << "Failed" << std::endl - << " Pixel differ (as expanded in memory)." << std::endl; - file->Delete(); - filehelper->Delete(); - fileout->Delete(); - reread->Delete(); - return 1; - } - std::cout << "4...OK." << std::endl ; + std::string PixelType = filehelper->GetFile()->GetPixelType(); + std::string ts = filehelper->GetFile()->GetTransferSyntax(); + + for(int i1=0; i1 2) { + nbDiff++; + // break; // at debug time, keep line commented out; (uncommenting will save CPU time) + } + + if (nbDiff!=0) + { + std::cout << std::endl << filename << " Failed : " + << nbDiff/(file->GetBitsAllocated()/8) << " Pixels -amongst " + << dataSizeFixed/(file->GetBitsAllocated()/8) << "- (" + << PixelType << " bAlloc:" << file->GetBitsAllocated() << " bStored:" << file->GetBitsStored() + << ") differ (as expanded in memory)." + << std::endl + << " compression : " + << GDCM_NAME_SPACE::Global::GetTS()->GetValue(ts) << std::endl; + + std::cout << " list of the first " << MAX_NUMBER_OF_DIFFERENCE + << " bytes differing (pos : original - written) :" + << std::endl; + + for(int i=0, j=0; i 2) + { + if (jDelete(); + filehelper->Delete(); + fileout->Delete(); + reread->Delete(); + nb_of_failure___++; + + if (nbDiff/2 > 8 ) // last pixel of (DermaColorLossLess.dcm) is diferent. ?!? + // I don't want it to break the testsuite + return 1; + else + return 0; + } + else + { + std::cout << std::endl << filename << " : some pixels" + << " (" + << PixelType << " bAlloc:" << file->GetBitsAllocated() << " bStored:" << file->GetBitsStored() + << ") differ +/-1 (as expanded in memory)." + << std::endl + << " compression : " + << GDCM_NAME_SPACE::Global::GetTS()->GetValue(ts) << std::endl; + + std::cout << " list of the first " << MAX_NUMBER_OF_DIFFERENCE + << " bytes differing (pos : original - written) :" + << std::endl; + for(int i=0, j=0; iDelete(); filehelper->Delete(); @@ -142,10 +235,15 @@ int CompareInternal(std::string const &filename, std::string const &output) return 0; } +// ------------------------------------------------------------------------------------------- + int TestReadWriteReadCompare(int argc, char *argv[]) { int result = 0; - + nb_of_success___ = 0; + nb_of_failure___ = 0; + nb_of_diffPM1___ = 0; + if (argc == 4) GDCM_NAME_SPACE::Debug::DebugOn(); @@ -168,8 +266,8 @@ int TestReadWriteReadCompare(int argc, char *argv[]) std::cout << " step 1: parse the image (as gdcmFile) and call" << " IsReadable(). " << std::endl; std::cout << " step 2: write the corresponding image in DICOM V3 " - << "with explicit" << std::endl - << " Value Representation in temporary file " + << "with explicit Value Representation " << std::endl + << " in temporary file " << "TestReadWriteReadCompare.dcm." << std::endl; std::cout << " step 3: read the image written on step2 and call " << " IsReadable(). " << std::endl; @@ -178,13 +276,25 @@ int TestReadWriteReadCompare(int argc, char *argv[]) << " match (as expanded by gdcm)." << std::endl; int i = 0; + int res =0; while( gdcmDataImages[i] != 0 ) { std::string filename = GDCM_DATA_ROOT; filename += "/"; - filename += gdcmDataImages[i++]; - result += CompareInternal(filename, "TestReadWriteReadCompare.dcm"); + filename += gdcmDataImages[i]; + res = CompareInternal(filename, "TestReadWriteReadCompare.dcm"); + + if (res == 1) + { + std::cout << "=============================== Failure on: " << gdcmDataImages[i] << std::endl; + result ++; + } + i ++; } } + std::cout << "==================================" << std::endl; + std::cout << "nb of success " << nb_of_success___ << std::endl; + std::cout << "nb of failure " << nb_of_failure___ << std::endl; + std::cout << "nb of diff+/-1 " << nb_of_diffPM1___ << std::endl; return result; } -- 2.45.1