X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyDicom.cxx;h=66a4fbfd62ba500add92a2ff63ed5028626e3c24;hb=359ebc818c100156bd8f7a3a8783f2c538474990;hp=9706397c7a37bde09657f98ab7d7fe0b288ba8a1;hpb=b8ca604b2c1c17790f19ac61b63dfb5b550ac6c0;p=gdcm.git diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx index 9706397c..66a4fbfd 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/17 10:20:06 $ - Version: $Revision: 1.17 $ + Date: $Date: 2005/10/21 08:35:49 $ + Version: $Revision: 1.43 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,139 +15,207 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" #include "gdcmFile.h" -#include "gdcmDocument.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" +#include "gdcmFileHelper.h" +#include "gdcmDataEntry.h" //Generated file: #include "gdcmDataImages.h" -#ifndef _WIN32 -#include //for access, unlink -#else -#include //for _access on Win32 -#endif - // return true if the file exists -bool FileExists(const char* filename) -{ -#ifdef _MSC_VER -# define access _access -#endif -#ifndef R_OK -# define R_OK 04 -#endif - if ( access(filename, R_OK) != 0 ) - { - return false; - } - else - { - return true; - } -} - -bool RemoveFile(const char* source) -{ -#ifdef _MSC_VER -#define _unlink unlink -#endif - 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 +bool FileExists(const char *filename); +bool RemoveFile(const char *source); -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; } } - gdcm::File *original = new gdcm::File( filename ); - gdcm::File *copy = new gdcm::File( output ); + //////////////// Step 1: + std::cout << " 1..."; + + gdcm::File *originalH = new gdcm::File( ); + gdcm::File *copyH = new gdcm::File( ); - const gdcm::TagDocEntryHT & Ht = original->GetHeader()->GetTagHT(); + originalH->SetFileName( filename ); + originalH->Load( ); + //First of all copy the file, field by field - size_t dataSize = original->GetImageDataSize(); - uint8_t* imageData = original->GetImageData(); - - //First of all copy the header field by field - - // Warning :Accessor gdcmElementSet::GetEntry() should not exist - // It was commented out by Mathieu, that was a *good* idea - // (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..."; + gdcm::DocEntry *d=originalH->GetFirstEntry(); + while(d) { - d = tag->second; - if ( gdcm::BinEntry* b = dynamic_cast(d) ) - { - copy->GetHeader()->ReplaceOrCreateByNumber( - b->GetBinArea(), - b->GetLength(), - b->GetGroup(), - b->GetElement(), - b->GetVR() ); - } - else if ( gdcm::ValEntry* v = dynamic_cast(d) ) - { - copy->GetHeader()->ReplaceOrCreateByNumber( - v->GetValue(), - v->GetGroup(), - v->GetElement(), - v->GetVR() ); + if ( gdcm::DataEntry *de = dynamic_cast(d) ) + { + copyH->InsertEntryBinArea( de->GetBinArea(),de->GetLength(), + de->GetGroup(),de->GetElement(), + de->GetVR() ); } else { // We skip pb of SQ recursive exploration - //std::cout << "Skipped Sequence " - // << "------------- " << d->GetVR() << " "<< std::hex - // << d->GetGroup() << " " << d->GetElement() - // << std::endl; } + + d=originalH->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); + gdcm::FileHelper *original = new gdcm::FileHelper( originalH ); + gdcm::FileHelper *copy = new gdcm::FileHelper( copyH ); + + size_t dataSize = original->GetImageDataSize(); + uint8_t *imageData = original->GetImageData(); + + // Useless to set the image data, because it's already made when + // copying the corresponding DataEntry that contains the pixel data + + // --> FIXME : Why do we let the following line? + // to avoid compile time warnings? + copy->SetImageData(imageData, dataSize); + + //////////////// Step 3: + std::cout << "3..."; + copy->SetWriteModeToRGB(); + if( !copy->WriteDcmExplVR(output) ) + { + std::cout << " Failed" << std::endl + << " " << output << " not written" << std::endl; + + delete original; + delete copy; + delete originalH; + delete copyH; - copy->WriteDcmExplVR( output ); + return 1; + } - delete original; delete copy; + delete copyH; - copy = new gdcm::File( output ); + //////////////// Step 4: + std::cout << "4..."; + copy = new gdcm::FileHelper( output ); //Is the file written still gdcm parsable ? - if ( !copy->GetHeader()->IsReadable() ) + if ( !copy->GetFile()->IsReadable() ) { - retVal +=1; - std::cout << output << " Failed" << std::endl; + std::cout << " Failed" << std::endl + << " " << output << " not readable" << std::endl; + + delete original; + delete originalH; + + return 1; } + + //////////////// Step 5: + std::cout << "5..."; + size_t dataSizeWritten = copy->GetImageDataSize(); + uint8_t *imageDataWritten = copy->GetImageData(); + + if (dataSize != dataSizeWritten) + { + std::cout << " Failed" << std::endl + << " Pixel areas lengths differ: " + << dataSize << " # " << dataSizeWritten << std::endl; + + delete original; + delete copy; + delete originalH; + + 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; + delete originalH; + + return 1; + } + std::cout << "OK." << std::endl ; + + delete original; + delete copy; + delete originalH; + + 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 gdcmFile) 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 data 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 = "output.dcm"; + + if( CopyDicom( filename, output ) != 0 ) + { + retVal++; + } + i++; } return retVal;