X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyDicom.cxx;h=212e0d02d5528238326b88aa44f9788e8287ad6d;hb=f541928adfc662b7ae54169e75d2bcf05566b724;hp=66c2ad2214992fe18c5677a247a3a72e9449601d;hpb=c42ce41966ee7a572752d7f45ddff25b90515119;p=gdcm.git diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx index 66c2ad22..212e0d02 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/24 10:23:46 $ - Version: $Revision: 1.19 $ + Date: $Date: 2005/10/18 08:35:46 $ + Version: $Revision: 1.42 $ 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 FileExists(const char *filename); +bool RemoveFile(const char *source); -bool RemoveFile(const char* source) -{ -#ifdef _MSC_VER -#define _unlink unlink -#endif - return unlink(source) != 0 ? false : true; -} - -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,96 +41,92 @@ int CopyDicom(std::string const & filename, //////////////// Step 1: std::cout << " 1..."; - gdcm::File *original = new gdcm::File( filename ); - gdcm::File *copy = new gdcm::File( output ); - - size_t dataSize = original->GetImageDataSize(); - uint8_t* imageData = original->GetImageData(); - (void)dataSize; // To use the variable and not have warnings at compil. - (void)imageData; // To use the variable and not have warnings at compil. - - //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::File *originalH = new gdcm::File( ); + gdcm::File *copyH = new gdcm::File( ); + originalH->SetFileName( filename ); + originalH->Load( ); + //First of all copy the file, field by field //////////////// Step 2: std::cout << "2..."; - original->GetHeader()->Initialize(); - gdcm::DocEntry* d=original->GetHeader()->GetNextEntry(); - + gdcm::DocEntry *d=originalH->GetFirstEntry(); while(d) { - 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=original->GetHeader()->GetNextEntry(); + d=originalH->GetNextEntry(); } + 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 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 copy->SetImageData(imageData, dataSize); -// copy->GetImageData(); -// original->GetHeader()->SetImageDataSize(dataSize); //////////////// Step 3: std::cout << "3..."; - copy->WriteDcmExplVR( output ); + copy->SetWriteModeToRGB(); + if( !copy->WriteDcmExplVR(output) ) + { + std::cout << " Failed" << std::endl + << " " << output << " not written" << std::endl; + + delete original; + delete copy; + delete originalH; + delete copyH; + + return 1; + } delete copy; + delete copyH; //////////////// Step 4: std::cout << "4..."; - copy = new gdcm::File( output ); + copy = new gdcm::FileHelper( output ); //Is the file written still gdcm parsable ? - if ( !copy->GetHeader()->IsReadable() ) + if ( !copy->GetFile()->IsReadable() ) { - std::cout << "=> " << output << " Failed" << std::endl; + std::cout << " Failed" << std::endl + << " " << output << " not readable" << std::endl; + delete original; - return(1); + delete originalH; + + return 1; } //////////////// Step 5: std::cout << "5..."; - int dataSizeWritten = copy->GetImageDataSize(); - uint8_t* imageDataWritten = copy->GetImageData(); + 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; + << " Pixel areas lengths differ: " + << dataSize << " # " << dataSizeWritten << std::endl; delete original; delete copy; + delete originalH; return 1; } @@ -171,10 +135,11 @@ int CopyDicom(std::string const & filename, { (void)res; std::cout << " Failed" << std::endl - << " Pixel differ (as expanded in memory)." << std::endl; + << " Pixel differ (as expanded in memory)." << std::endl; delete original; delete copy; + delete originalH; return 1; } @@ -182,6 +147,7 @@ int CopyDicom(std::string const & filename, delete original; delete copy; + delete originalH; return 0; } @@ -189,7 +155,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 ) { @@ -216,12 +182,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; @@ -240,7 +206,6 @@ int TestCopyDicom(int argc, char* argv[]) filename += "/"; //doh! filename += gdcmDataImages[i]; -// std::string output = "../Testing/Temporary/output.dcm"; std::string output = "output.dcm"; if( CopyDicom( filename, output ) != 0 )