Program: gdcm
Module: $RCSfile: TestReadWriteReadCompare.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 10:23:46 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2005/01/21 11:40:54 $
+ 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
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "gdcmHeader.h"
#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
//Generated file:
#include "gdcmDataImages.h"
//////////////// Step 1 (see above description):
- gdcm::Header *header = new gdcm::Header( filename );
+ gdcm::File *header = new gdcm::File( filename );
if( !header->IsReadable() )
{
std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
//////////////// Step 2:
- gdcm::File* file = new gdcm::File( header );
+ gdcm::FileHelper* file = new gdcm::FileHelper( header );
int dataSize = file->GetImageDataSize();
uint8_t* imageData = file->GetImageData(); //EXTREMELY IMPORTANT
// Sure, it is : It's up to the user to decide if he wants to
//////////////// Step 3:
- gdcm::File* reread = new gdcm::File( output );
- if( !reread->GetHeader()->IsReadable() )
+ gdcm::FileHelper* reread = new gdcm::FileHelper( output );
+ if( !reread->GetFile()->IsReadable() )
{
std::cerr << "Failed" << std::endl
<< "Test::TestReadWriteReadCompare: Could not reread image "
uint8_t* imageDataWritten = reread->GetImageData();
//////////////// Step 4:
+ // Test the image size
+ if (header->GetXSize() != reread->GetFile()->GetXSize() ||
+ header->GetYSize() != reread->GetFile()->GetYSize() ||
+ header->GetZSize() != reread->GetFile()->GetZSize())
+ {
+ std::cout << "Failed" << std::endl
+ << " X Size differs: "
+ << "X: " << header->GetXSize() << " # "
+ << reread->GetFile()->GetXSize() << " | "
+ << "Y: " << header->GetYSize() << " # "
+ << reread->GetFile()->GetYSize() << " | "
+ << "Z: " << header->GetZSize() << " # "
+ << reread->GetFile()->GetZSize() << std::endl;
+ delete header;
+ delete file;
+ delete reread;
+ return 1;
+ }
+ // Test the data size
if (dataSize != dataSizeWritten)
{
std::cout << "Failed" << std::endl
return 1;
}
+ // Test the data's content
if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0)
{
(void)res;
std::cout << " For all images in gdcmData (and not blacklisted in "
"Test/CMakeLists.txt)" << std::endl;
std::cout << " apply the following multistep test: " << 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(). " << std::endl;
std::cout << " step 2: write the corresponding image in DICOM V3 "
<< "with explicit" << std::endl