X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyDicom.cxx;h=f74e39d2ba95f5e01a845b6a8435e096e7181608;hb=6b0359d3c073112a5d6a23114d6adb0fff949e7b;hp=3a86991244d95ae696b663a4ca68a316f44c5467;hpb=baa2037ebb1ea642207f98a099306b3e9fd7d9f4;p=gdcm.git diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx index 3a869912..f74e39d2 100644 --- a/Testing/TestCopyDicom.cxx +++ b/Testing/TestCopyDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestCopyDicom.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 14:49:15 $ - Version: $Revision: 1.27 $ + Date: $Date: 2005/02/03 10:00:06 $ + Version: $Revision: 1.39 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" #include "gdcmFile.h" +#include "gdcmFileHelper.h" #include "gdcmValEntry.h" #include "gdcmBinEntry.h" @@ -30,7 +30,7 @@ #endif // return true if the file exists -bool FileExists(const char* filename) +bool FileExists(const char *filename) { #ifdef _MSC_VER # define access _access @@ -48,7 +48,7 @@ bool FileExists(const char* filename) } } -bool RemoveFile(const char* source) +bool RemoveFile(const char *source) { #ifdef _MSC_VER #define _unlink unlink @@ -56,13 +56,12 @@ bool RemoveFile(const char* source) 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; @@ -72,40 +71,27 @@ int CopyDicom(std::string const & filename, //////////////// Step 1: std::cout << " 1..."; - gdcm::Header *originalH = new gdcm::Header( filename ); - gdcm::Header *copyH = new gdcm::Header( ); - - //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( filename ); + gdcm::File *copyH = new gdcm::File( ); + //First of all copy the file, field by field //////////////// Step 2: std::cout << "2..."; - originalH->Initialize(); - gdcm::DocEntry* d=originalH->GetNextEntry(); - + gdcm::DocEntry *d=originalH->GetFirstEntry(); while(d) { - if ( gdcm::BinEntry* b = dynamic_cast(d) ) + if ( gdcm::BinEntry *b = dynamic_cast(d) ) { - copyH->ReplaceOrCreateByNumber( - b->GetBinArea(), - b->GetLength(), - b->GetGroup(), - b->GetElement(), - b->GetVR() ); + copyH->InsertBinEntry( b->GetBinArea(),b->GetLength(), + b->GetGroup(),b->GetElement(), + b->GetVR() ); } - else if ( gdcm::ValEntry* v = dynamic_cast(d) ) + else if ( gdcm::ValEntry *v = dynamic_cast(d) ) { - copyH->ReplaceOrCreateByNumber( - v->GetValue(), - v->GetGroup(), - v->GetElement(), - v->GetVR() ); + copyH->InsertValEntry( v->GetValue(), + v->GetGroup(),v->GetElement(), + v->GetVR() ); } else { @@ -115,14 +101,14 @@ int CopyDicom(std::string const & filename, d=originalH->GetNextEntry(); } - gdcm::File *original = new gdcm::File( originalH ); - gdcm::File *copy = new gdcm::File( copyH ); + gdcm::FileHelper *original = new gdcm::FileHelper( originalH ); + gdcm::FileHelper *copy = new gdcm::FileHelper( 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 BinEntry that contains the pixel data copy->SetImageData(imageData, dataSize); //////////////// Step 3: @@ -146,10 +132,10 @@ int CopyDicom(std::string const & filename, //////////////// 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 << " Failed" << std::endl << " " << output << " not readable" << std::endl; @@ -163,7 +149,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) { @@ -202,7 +188,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 ) { @@ -229,12 +215,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;