X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestReadWriteReadCompare.cxx;h=cadead8a8986d8a576ed40a9ee380f561f5e79a7;hb=951d1f96c7bff6329f19fa28444fae5c941c352d;hp=cc48edb7bd94bdf1bf46d7df9c7218e8d0c7b859;hpb=abac16617f1453f5db19618ccb45e821efa867b6;p=gdcm.git diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx index cc48edb7..cadead8a 100644 --- a/Testing/TestReadWriteReadCompare.cxx +++ b/Testing/TestReadWriteReadCompare.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestReadWriteReadCompare.cxx,v $ Language: C++ - Date: $Date: 2004/11/30 14:17:52 $ - Version: $Revision: 1.17 $ + Date: $Date: 2005/07/21 04:51:26 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,93 +15,84 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" #include "gdcmFile.h" +#include "gdcmFileHelper.h" +#include "gdcmDebug.h" //Generated file: #include "gdcmDataImages.h" - -int CompareInternal(std::string const & filename, std::string const & output) + +int CompareInternal(std::string const &filename, std::string const &output) { std::cout << " Testing: " << filename << std::endl; //////////////// Step 1 (see above description): - gdcm::Header *header = new gdcm::Header( filename ); - if( !header->IsReadable() ) + gdcm::File *file = new gdcm::File( ); + file->SetFileName( filename ); + file->Load (); + if( !file->IsReadable() ) { std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:" << filename << std::endl; - delete header; + delete file; return 1; } std::cout << " step 1..."; //////////////// Step 2: - - gdcm::File* file = new gdcm::File( header ); - int dataSize = file->GetImageDataSize(); - uint8_t* imageData = file->GetImageData(); //EXTREMELY IMPORTANT + gdcm::FileHelper *filehelper = new gdcm::FileHelper( file ); + 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 // (even if we do it by setting a flag, he will have to decide) - /// \todo Following line commented out because gdcmFile::SetImageData() is - /// brain dead: it sets ImageDataSize to its argument and PixelRead to a. - /// Later on, when writing gdcmFile::WriteBase() - /// and because PixelRead == 1 we call - /// PixelElement->SetLength( ImageDataSizeRaw ); - /// where we use ImageDataSizeRAW instead of ImageDataSize ! - /// But when the original image made the transformation LUT -> RGB, - /// ImageDataSizeRaw is the third of ImageDataSize, and there is no - /// reason (since we called gdcmFile::SetImageData) to use the Raw image - /// size... This "bug" in gdcmFile made that we had to black list - /// images 8BitsUncompressedColor.dcm, OT-PAL-8-face.dcm and - /// US-PAL-8-10x-echo.dcm... - /// In conclusion fix gdcmFile, and then uncomment the following line. - - // --> I did. ctest doesn't break. But ... is it enought to say it's OK ? - - file->SetImageData(imageData, dataSize); + //filehelper->SetImageData(imageData, dataSize); - file->SetWriteModeToRGB(); - file->WriteDcmExplVR( output ); + filehelper->SetWriteModeToRGB(); + filehelper->WriteDcmExplVR( output ); std::cout << "2..."; //////////////// Step 3: - - gdcm::File* reread = new gdcm::File( output ); - if( !reread->GetHeader()->IsReadable() ) + gdcm::File *fileout = new gdcm::File(); + fileout->SetFileName( output ); + fileout->Load(); + // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated + + if( !fileout->IsReadable() ) { std::cerr << "Failed" << std::endl - << "Test::TestReadWriteReadCompare: Could not reread image " - << "written:" << filename << std::endl; - delete header; + << "Test::TestReadWriteReadCompare: Could not parse the newly " + << "written image:" << filename << std::endl; delete file; - delete reread; + delete filehelper; return 1; } + + gdcm::FileHelper *reread = new gdcm::FileHelper( fileout ); + std::cout << "3..."; // For the next step: int dataSizeWritten = reread->GetImageDataSize(); - uint8_t* imageDataWritten = reread->GetImageData(); + uint8_t *imageDataWritten = reread->GetImageData(); //////////////// Step 4: // Test the image size - if (header->GetXSize() != reread->GetHeader()->GetXSize() || - header->GetYSize() != reread->GetHeader()->GetYSize() || - header->GetZSize() != reread->GetHeader()->GetZSize()) + if (file->GetXSize() != reread->GetFile()->GetXSize() || + file->GetYSize() != reread->GetFile()->GetYSize() || + file->GetZSize() != reread->GetFile()->GetZSize()) { std::cout << "Failed" << std::endl << " X Size differs: " - << "X: " << header->GetXSize() << " # " - << reread->GetHeader()->GetXSize() << " | " - << "Y: " << header->GetYSize() << " # " - << reread->GetHeader()->GetYSize() << " | " - << "Z: " << header->GetZSize() << " # " - << reread->GetHeader()->GetZSize() << std::endl; - delete header; + << "X: " << file->GetXSize() << " # " + << reread->GetFile()->GetXSize() << " | " + << "Y: " << file->GetYSize() << " # " + << reread->GetFile()->GetYSize() << " | " + << "Z: " << file->GetZSize() << " # " + << reread->GetFile()->GetZSize() << std::endl; delete file; + delete filehelper; delete reread; return 1; } @@ -112,43 +103,46 @@ int CompareInternal(std::string const & filename, std::string const & output) std::cout << "Failed" << std::endl << " Pixel areas lengths differ: " << dataSize << " # " << dataSizeWritten << std::endl; - delete header; delete file; + delete filehelper; delete reread; return 1; } // Test the data's content - if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0) + if (memcmp(imageData, imageDataWritten, dataSize) !=0) { - (void)res; std::cout << "Failed" << std::endl << " Pixel differ (as expanded in memory)." << std::endl; - delete header; delete file; + delete filehelper; delete reread; return 1; } std::cout << "4...OK." << std::endl ; //////////////// Clean up: - delete header; delete file; + delete filehelper; delete reread; return 0; } -int TestReadWriteReadCompare(int argc, char* argv[]) +int TestReadWriteReadCompare(int argc, char *argv[]) { int result = 0; - if (argc == 3) + + if (argc == 4) + gdcm::Debug::DebugOn(); + + if (argc >= 3) { - const std::string input = argv[1]; + const std::string input = argv[1]; const std::string output = argv[2]; result += CompareInternal(input, output); } - else if( argc > 3 || argc == 2 ) + else if( argc > 4 || argc == 2 ) { std::cerr << "Please read the manual" << std::endl; } @@ -158,7 +152,7 @@ int TestReadWriteReadCompare(int argc, char* argv[]) std::cout << " For all images in gdcmData (and not blacklisted in " "Test/CMakeLists.txt)" << std::endl; std::cout << " apply the following multistep test: " << std::endl; - std::cout << " step 1: parse the image (as gdcmHeader) and call" + 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