/*=========================================================================
-
+
Program: gdcm
Module: $RCSfile: TestReadWriteReadCompare.cxx,v $
Language: C++
- Date: $Date: 2005/02/09 15:06:48 $
- Version: $Revision: 1.22 $
-
+ Date: $Date: 2007/09/04 13:02:45 $
+ Version: $Revision: 1.33 $
+
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
-
+
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-
+
=========================================================================*/
#include "gdcmFile.h"
#include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
//Generated file:
#include "gdcmDataImages.h"
-int CompareInternal(std::string const & filename, std::string const & output)
+int CompareInternal(std::string const &filename, std::string const &output)
{
std::cout << " Testing: " << filename << std::endl;
//////////////// Step 1 (see above description):
- gdcm::File *file = new gdcm::File( filename );
+ GDCM_NAME_SPACE::File *file = GDCM_NAME_SPACE::File::New( );
+ file->SetFileName( filename );
+ file->Load ();
if( !file->IsReadable() )
{
- std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
+ std::cout << "Failed" << std::endl
+ << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
<< filename << std::endl;
- delete file;
+ file->Delete();
return 1;
}
std::cout << " step 1...";
-
+ std::cout << "--- End of Reading \n";
+
//////////////// Step 2:
- gdcm::FileHelper *filehelper = new gdcm::FileHelper( file );
+ GDCM_NAME_SPACE::FileHelper *filehelper = GDCM_NAME_SPACE::FileHelper::New( file );
int dataSize = filehelper->GetImageDataSize();
uint8_t *imageData = filehelper->GetImageData(); //EXTREMELY IMPORTANT
// Sure, it is : It's up to the user to decide if he wants to
// GetImageData or if he wants to GetImageDataRaw
- // (even if we do it by setting a flag, he will have to decide)
+ // (even if we do it by setting a flag, *he* will have to decide)
//filehelper->SetImageData(imageData, dataSize);
-
+
filehelper->SetWriteModeToRGB();
filehelper->WriteDcmExplVR( output );
std::cout << "2...";
-
+ std::cout << "--- End of Writting \n";
+
//////////////// Step 3:
- gdcm::FileHelper *reread = new gdcm::FileHelper( output );
- if( !reread->GetFile()->IsReadable() )
+ GDCM_NAME_SPACE::File *fileout = GDCM_NAME_SPACE::File::New();
+ fileout->SetFileName( output );
+ fileout->Load();
+ // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated
+
+ if( !fileout->IsReadable() )
{
- std::cerr << "Failed" << std::endl
- << "Test::TestReadWriteReadCompare: Could not reread image "
- << "written:" << filename << std::endl;
- delete file;
- delete filehelper;
- delete reread;
- return 1;
+ std::cout << "Failed" << std::endl
+ << "Test::TestReadWriteReadCompare: Could not parse the newly "
+ << "written image:" << filename << std::endl;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ return 1;
}
+ std::cout << "--- End of Re-Reading \n";
+ GDCM_NAME_SPACE::FileHelper *reread = GDCM_NAME_SPACE::FileHelper::New( fileout );
+
std::cout << "3...";
// For the next step:
int dataSizeWritten = reread->GetImageDataSize();
uint8_t *imageDataWritten = reread->GetImageData();
-
+ std::cout << "--- End of GetImageData \n";
+
//////////////// Step 4:
// Test the image size
if (file->GetXSize() != reread->GetFile()->GetXSize() ||
{
std::cout << "Failed" << std::endl
<< " X Size differs: "
- << "X: " << file->GetXSize() << " # "
+ << "X: " << file->GetXSize() << " # "
<< reread->GetFile()->GetXSize() << " | "
- << "Y: " << file->GetYSize() << " # "
+ << "Y: " << file->GetYSize() << " # "
<< reread->GetFile()->GetYSize() << " | "
- << "Z: " << file->GetZSize() << " # "
+ << "Z: " << file->GetZSize() << " # "
<< reread->GetFile()->GetZSize() << std::endl;
- delete file;
- delete filehelper;
- delete reread;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 1;
}
// Test the data size
- if (dataSize != dataSizeWritten)
+ // beware of odd length Pixel Element!
+ int dataSizeFixed = dataSize + dataSize%2;
+ int dataSizeWrittenFixed = dataSizeWritten + dataSizeWritten%2;
+
+ if (dataSizeFixed != dataSizeWrittenFixed)
{
std::cout << "Failed" << std::endl
<< " Pixel areas lengths differ: "
<< dataSize << " # " << dataSizeWritten << std::endl;
- delete file;
- delete filehelper;
- delete reread;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 1;
}
{
std::cout << "Failed" << std::endl
<< " Pixel differ (as expanded in memory)." << std::endl;
- delete file;
- delete filehelper;
- delete reread;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 1;
}
std::cout << "4...OK." << std::endl ;
//////////////// Clean up:
- delete file;
- delete filehelper;
- delete reread;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 0;
}
int TestReadWriteReadCompare(int argc, char *argv[])
{
int result = 0;
- if (argc == 3)
+
+ if (argc == 4)
+ GDCM_NAME_SPACE::Debug::DebugOn();
+
+ if (argc >= 3)
{
- const std::string input = argv[1];
+ const std::string input = argv[1];
const std::string output = argv[2];
result += CompareInternal(input, output);
}
- else if( argc > 3 || argc == 2 )
+ else if( argc > 4 || argc == 2 )
{
- std::cerr << "Please read the manual" << std::endl;
+ std::cout << "Please read the manual" << std::endl;
}
else
{