X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyDicom.cxx;h=698828b8cf20a010ca6abaf501af361d52f8e0a5;hb=d9f8b4b69e332d38e9c883ba60f40dc858883de9;hp=f9682db6c9f5e616a8d9f036227a9afb6c63ca61;hpb=21fa56d0388883f63f4cccf55cb42967d7ea5c30;p=gdcm.git diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx index f9682db6..698828b8 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/12/02 15:14:16 $ - Version: $Revision: 1.24 $ + Date: $Date: 2007/10/30 09:13:45 $ + Version: $Revision: 1.44 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,55 +15,23 @@ 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; -} +bool FileExists(const char *filename); +bool RemoveFile(const char *source); -int CopyDicom(std::string const & filename, - std::string const & output ) +int CopyDicom(std::string const &filename, + std::string const &output ) { 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::cout << "Ouch, the file exist, but I cannot remove it" << std::endl; @@ -73,61 +41,43 @@ int CopyDicom(std::string const & filename, //////////////// Step 1: std::cout << " 1..."; - gdcm::Header *originalH = new gdcm::Header( filename ); - gdcm::Header *copyH = new gdcm::Header( ); + GDCM_NAME_SPACE::File *originalH = GDCM_NAME_SPACE::File::New(); + GDCM_NAME_SPACE::File *copyH = GDCM_NAME_SPACE::File::New(); - //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 + originalH->SetFileName( filename ); + originalH->Load( ); + //First of all copy the file, field by field //////////////// Step 2: std::cout << "2..."; - originalH->Initialize(); - gdcm::DocEntry* d=originalH->GetNextEntry(); - + GDCM_NAME_SPACE::DocEntry *d=originalH->GetFirstEntry(); while(d) { - if ( gdcm::BinEntry* b = dynamic_cast(d) ) - { - copyH->ReplaceOrCreateByNumber( - b->GetBinArea(), - b->GetLength(), - b->GetGroup(), - b->GetElement(), - b->GetVR() ); - } - else if ( gdcm::ValEntry* v = dynamic_cast(d) ) - { - copyH->ReplaceOrCreateByNumber( - v->GetValue(), - v->GetGroup(), - v->GetElement(), - v->GetVR() ); + if ( GDCM_NAME_SPACE::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(); } - - gdcm::File *original = new gdcm::File( originalH ); - gdcm::File *copy = new gdcm::File( copyH ); + GDCM_NAME_SPACE::FileHelper *original = GDCM_NAME_SPACE::FileHelper::New(originalH); + GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New(copyH); size_t dataSize = original->GetImageDataSize(); - uint8_t* imageData = original->GetImageData(); + uint8_t *imageData = original->GetImageData(); - // Useless to set the image datas, because it's already made when - // copying the corresponding BinEntry that contains the pixel datas + // 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: @@ -136,31 +86,31 @@ int CopyDicom(std::string const & filename, if( !copy->WriteDcmExplVR(output) ) { std::cout << " Failed" << std::endl - << " " << output << " not written" << std::endl; + << " " << output << " not written" << std::endl; - delete original; - delete copy; - delete originalH; - delete copyH; + original->Delete(); + copy->Delete(); + originalH->Delete(); + copyH->Delete(); return 1; } - delete copy; - delete copyH; + copy->Delete(); + copyH->Delete(); //////////////// Step 4: std::cout << "4..."; - copy = new gdcm::File( output ); - +// copy = new GDCM_NAME_SPACE::FileHelper( output ); + copy = GDCM_NAME_SPACE::FileHelper::New(output); // ??? //Is the file written still gdcm parsable ? - if ( !copy->GetHeader()->IsReadable() ) + if ( !copy->GetFile()->IsReadable() ) { std::cout << " Failed" << std::endl << " " << output << " not readable" << std::endl; - delete original; - delete originalH; + original->Delete(); + originalH->Delete(); return 1; } @@ -168,7 +118,7 @@ int CopyDicom(std::string const & filename, //////////////// Step 5: std::cout << "5..."; size_t dataSizeWritten = copy->GetImageDataSize(); - uint8_t* imageDataWritten = copy->GetImageData(); + uint8_t *imageDataWritten = copy->GetImageData(); if (dataSize != dataSizeWritten) { @@ -176,9 +126,9 @@ int CopyDicom(std::string const & filename, << " Pixel areas lengths differ: " << dataSize << " # " << dataSizeWritten << std::endl; - delete original; - delete copy; - delete originalH; + original->Delete(); + copy->Delete(); + originalH->Delete(); return 1; } @@ -189,17 +139,17 @@ int CopyDicom(std::string const & filename, std::cout << " Failed" << std::endl << " Pixel differ (as expanded in memory)." << std::endl; - delete original; - delete copy; - delete originalH; + original->Delete(); + copy->Delete(); + originalH->Delete(); return 1; } std::cout << "OK." << std::endl ; - delete original; - delete copy; - delete originalH; + original->Delete(); + copy->Delete(); + originalH->Delete(); return 0; } @@ -207,7 +157,7 @@ int CopyDicom(std::string const & filename, // 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[]) +int TestCopyDicom(int argc, char *argv[]) { if ( argc == 3 ) { @@ -234,12 +184,12 @@ int TestCopyDicom(int argc, char* argv[]) << std::endl; std::cout << " apply the following to each filename.xxx: " << 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(). 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" + << " pixel data are set to the copy" << std::endl; std::cout << " step 3: write the copy of the image" << std::endl;