Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/30 14:17:52 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2005/01/21 11:40:53 $
+ Version: $Revision: 1.25 $
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 <stdio.h>
+#include "gdcmFileHelper.h"
+
+#include <iostream>
+#include <fstream>
//Generated file:
#include "gdcmDataImages.h"
////// Step 1:
std::cout << " 1...";
- gdcm::File* tested = new gdcm::File( filename );
- if( !tested->GetHeader()->IsReadable() )
+ gdcm::FileHelper* tested = new gdcm::FileHelper( filename );
+ if( !tested->GetFile()->IsReadable() )
{
std::cout << " Failed" << std::endl
<< " Image not gdcm compatible:"
////// Check for existence of reference baseline dicom file:
std::cout << "2...";
- FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+ //FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+ std::ifstream testFILE( referenceFileName.c_str() );
if (! testFILE )
{
uint8_t* testedImageData = tested->GetImageData(); // Kludge
}
else
{
- fclose( testFILE );
+ //fclose( testFILE );
}
+ testFILE.close();
////// Step 3a:
////// When reference file is not gdcm readable test is failed:
std::cout << "3a...";
- gdcm::File* reference = new gdcm::File( referenceFileName );
- if( !reference->GetHeader()->IsReadable() )
+ gdcm::FileHelper* reference = new gdcm::FileHelper( referenceFileName );
+ if( !reference->GetFile()->IsReadable() )
{
std::cout << " Failed" << std::endl
<< " reference image "
return 1;
}
+ std::string PixelType = reference->GetFile()->GetPixelType();
+
////// Step 3b:
std::cout << "3b...";
int testedDataSize = tested->GetImageDataSize();
uint8_t* referenceImageData = reference->GetImageData();
// Test the image size
- if (tested->GetHeader()->GetXSize() != reference->GetHeader()->GetXSize() ||
- tested->GetHeader()->GetYSize() != reference->GetHeader()->GetYSize() ||
- tested->GetHeader()->GetZSize() != reference->GetHeader()->GetZSize())
+ if (tested->GetFile()->GetXSize() != reference->GetFile()->GetXSize() ||
+ tested->GetFile()->GetYSize() != reference->GetFile()->GetYSize() ||
+ tested->GetFile()->GetZSize() != reference->GetFile()->GetZSize())
{
std::cout << "Failed" << std::endl
<< " Size differs: "
- << "X: " << tested->GetHeader()->GetXSize() << " # "
- << reference->GetHeader()->GetXSize() << " | "
- << "Y: " << tested->GetHeader()->GetYSize() << " # "
- << reference->GetHeader()->GetYSize() << " | "
- << "Z: " << tested->GetHeader()->GetZSize() << " # "
- << reference->GetHeader()->GetZSize() << std::endl;
+ << "X: " << tested->GetFile()->GetXSize() << " # "
+ << reference->GetFile()->GetXSize() << " | "
+ << "Y: " << tested->GetFile()->GetYSize() << " # "
+ << reference->GetFile()->GetYSize() << " | "
+ << "Z: " << tested->GetFile()->GetZSize() << " # "
+ << reference->GetFile()->GetZSize() << std::endl;
delete reference;
delete tested;
return 1;
if (testedDataSize != referenceDataSize)
{
std::cout << " Failed" << std::endl
- << " pixel areas lengths differ: "
+ << " pixel ("
+ << PixelType
+ <<") areas lengths differ: "
<< testedDataSize << " # " << referenceDataSize
<< std::endl;
delete tested;
{
(void)res;
std::cout << " Failed" << std::endl
- << " pixel differ (as expanded in memory)."
+ << " pixel ("
+ << PixelType
+ << ") differ (as expanded in memory)."
<< std::endl;
delete tested;
delete reference;
<< 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(). "
<< std::endl;
std::cout << " step 2: find in GDCM_DATA_ROOT/BaselineDicom/filename.dcm"