X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=Testing%2FTestCopyDicom.cxx;h=5a3aa14e53be95283d3eb6a6279c5ba565194dc2;hb=c852120fdb6d542d84f74440b68414fdb52178d7;hp=a1804823678ea92f6b39e5f3146c249262038794;hpb=610786e334321c5c9a69139e1054372c76ed78d4;p=gdcm.git diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx index a1804823..5a3aa14e 100644 --- a/Testing/TestCopyDicom.cxx +++ b/Testing/TestCopyDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestCopyDicom.cxx,v $ Language: C++ - Date: $Date: 2004/11/18 17:06:54 $ - Version: $Revision: 1.18 $ + Date: $Date: 2004/11/24 16:39:18 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,39 +57,27 @@ bool RemoveFile(const char* source) return unlink(source) != 0 ? false : true; } -// Here we load a gdcmFile and then try to create from scratch a copy of it, -// copying field by field the dicom image - -int TestCopyDicom(int , char* []) +int CopyDicom(std::string const & filename, + std::string const & output ) { - int i =0; - int retVal = 0; //by default this is an error - while( gdcmDataImages[i] != 0 ) - { - std::string filename = GDCM_DATA_ROOT; - filename += "/"; //doh! - filename += gdcmDataImages[i]; - std::cerr << "Filename: " << filename << std::endl; - - std::string output = "../Testing/Temporary/output.dcm"; - + std::cout << " Testing: " << filename << std::endl; if( FileExists( output.c_str() ) ) { // std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl; if( !RemoveFile( output.c_str() ) ) { - std::cerr << "Ouch, the file exist, but I cannot remove it" << std::endl; + std::cout << "Ouch, the file exist, but I cannot remove it" << std::endl; return 1; } } + //////////////// Step 1: + std::cout << " 1..."; gdcm::File *original = new gdcm::File( filename ); gdcm::File *copy = new gdcm::File( output ); - const gdcm::TagDocEntryHT & Ht = original->GetHeader()->GetTagHT(); - - size_t dataSize = original->GetImageDataSize(); - uint8_t* imageData = original->GetImageData(); + size_t dataSize = original->GetImageDataSizeRaw(); + uint8_t* imageData = original->GetImageDataRaw(); (void)dataSize; // To use the variable and not have warnings at compil. (void)imageData; // To use the variable and not have warnings at compil. @@ -100,11 +88,14 @@ int TestCopyDicom(int , char* []) // (the user does NOT have to know the way we implemented the Header !) // Waiting for a 'clean' solution, I keep the method ...JPRx - gdcm::DocEntry* d; - for (gdcm::TagDocEntryHT::const_iterator tag = Ht.begin(); tag != Ht.end(); ++tag) + //////////////// Step 2: + std::cout << "2..."; + original->GetHeader()->Initialize(); + gdcm::DocEntry* d=original->GetHeader()->GetNextEntry(); + + while(d) { - d = tag->second; if ( gdcm::BinEntry* b = dynamic_cast(d) ) { copy->GetHeader()->ReplaceOrCreateByNumber( @@ -130,26 +121,133 @@ int TestCopyDicom(int , char* []) // << d->GetGroup() << " " << d->GetElement() // << std::endl; } + + d=original->GetHeader()->GetNextEntry(); } + // Useless to set the image datas, because it's already made when // copying the corresponding BinEntry that contains the pixel datas - //copy->SetImageData(imageData, dataSize); - original->GetHeader()->SetImageDataSize(dataSize); + copy->SetImageData(imageData, dataSize); +// copy->GetImageData(); +// original->GetHeader()->SetImageDataSize(dataSize); + //////////////// Step 3: + std::cout << "3..."; copy->WriteDcmExplVR( output ); - delete original; delete copy; + //////////////// Step 4: + std::cout << "4..."; copy = new gdcm::File( output ); //Is the file written still gdcm parsable ? if ( !copy->GetHeader()->IsReadable() ) { - retVal +=1; - std::cout << output << " Failed" << std::endl; + std::cout << "=> " << output << " Failed" << std::endl; + delete original; + return(1); + } + + //////////////// Step 5: + std::cout << "5..."; + int dataSizeWritten = copy->GetImageDataSizeRaw(); + uint8_t* imageDataWritten = copy->GetImageDataRaw(); + + if (dataSize != dataSizeWritten) + { + std::cout << " Failed" << std::endl + << " Pixel areas lengths differ: " + << dataSize << " # " << dataSizeWritten << std::endl; + + delete original; + delete copy; + + return 1; + } + + if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0) + { + (void)res; + std::cout << " Failed" << std::endl + << " Pixel differ (as expanded in memory)." << std::endl; + + delete original; + delete copy; + + return 1; } + std::cout << "OK." << std::endl ; + + delete original; + delete copy; + + return 0; +} + +// Here we load a gdcmFile and then try to create from scratch a copy of it, +// copying field by field the dicom image + +int TestCopyDicom(int argc, char* argv[]) +{ + 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 CopyDicom( input, reference ); + } + else if ( argc > 3 || argc == 2 ) + { + std::cout << " Usage: " << argv[0] + << " (no arguments needed)." << std::endl; + std::cout << "or Usage: " << argv[0] + << " filename.dcm reference.dcm" << std::endl; + return 1; + } + // else other cases: + + std::cout << " Description (Test::TestCopyDicom): " + << std::endl; + std::cout << " For all images in gdcmData (and not blacklisted in " + "Test/CMakeLists.txt)" + << std::endl; + std::cout << " apply the following to each filename.xxx: " + << std::endl; + std::cout << " step 1: parse the image (as gdcmHeader) and call" + << " IsReadable(). After that, call GetImageData() and " + << "GetImageDataSize() " + << std::endl; + std::cout << " step 2: create a copy of the readed file and the new" + << " pixel datas are set to the copy" + << std::endl; + std::cout << " step 3: write the copy of the image" + << std::endl; + std::cout << " step 4: read the copy and call IsReadable()" + << std::endl; + std::cout << " step 5: compare (in memory with memcmp) that the two " + << "images " << std::endl + << " match (as expanded by gdcm)." << std::endl; + std::cout << std::endl; + + int i =0; + int retVal = 0; //by default this is an error + while( gdcmDataImages[i] != 0 ) + { + std::string filename = GDCM_DATA_ROOT; + filename += "/"; //doh! + filename += gdcmDataImages[i]; + +// std::string output = "../Testing/Temporary/output.dcm"; + std::string output = "output.dcm"; + + if( CopyDicom( filename, output ) != 0 ) + { + retVal++; + } + i++; } return retVal;