Program: gdcm
Module: $RCSfile: TestReadWriteReadCompare.cxx,v $
Language: C++
- Date: $Date: 2005/01/20 16:16:59 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2006/05/05 22:13:55 $
+ Version: $Revision: 1.28 $
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"
+#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::Header *header = new gdcm::Header( filename );
- if( !header->IsReadable() )
+ gdcm::File *file = gdcm::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 header;
+ file->Delete();
return 1;
}
std::cout << " step 1...";
//////////////// Step 2:
-
- gdcm::FileHelper* file = new gdcm::FileHelper( header );
- int dataSize = file->GetImageDataSize();
- uint8_t* imageData = file->GetImageData(); //EXTREMELY IMPORTANT
+ gdcm::FileHelper *filehelper = gdcm::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)
- /// \todo Following line commented out because gdcmFile::SetImageData() is
- /// brain dead: it sets ImageDataSize to its argument and PixelRead to a.
- /// Later on, when writing gdcmFile::WriteBase()
- /// and because PixelRead == 1 we call
- /// PixelElement->SetLength( ImageDataSizeRaw );
- /// where we use ImageDataSizeRAW instead of ImageDataSize !
- /// But when the original image made the transformation LUT -> RGB,
- /// ImageDataSizeRaw is the third of ImageDataSize, and there is no
- /// reason (since we called gdcmFile::SetImageData) to use the Raw image
- /// size... This "bug" in gdcmFile made that we had to black list
- /// images 8BitsUncompressedColor.dcm, OT-PAL-8-face.dcm and
- /// US-PAL-8-10x-echo.dcm...
- /// In conclusion fix gdcmFile, and then uncomment the following line.
-
- // --> I did. ctest doesn't break. But ... is it enought to say it's OK ?
+ //filehelper->SetImageData(imageData, dataSize);
- file->SetImageData(imageData, dataSize);
-
- file->SetWriteModeToRGB();
- file->WriteDcmExplVR( output );
+ filehelper->SetWriteModeToRGB();
+ filehelper->WriteDcmExplVR( output );
std::cout << "2...";
//////////////// Step 3:
+ gdcm::File *fileout = gdcm::File::New();
+ fileout->SetFileName( output );
+ fileout->Load();
+ // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated
- gdcm::FileHelper* reread = new gdcm::FileHelper( output );
- if( !reread->GetHeader()->IsReadable() )
+ if( !fileout->IsReadable() )
{
- std::cerr << "Failed" << std::endl
- << "Test::TestReadWriteReadCompare: Could not reread image "
- << "written:" << filename << std::endl;
- delete header;
- delete file;
- 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;
}
+
+ gdcm::FileHelper *reread = gdcm::FileHelper::New( fileout );
+
std::cout << "3...";
// For the next step:
int dataSizeWritten = reread->GetImageDataSize();
- uint8_t* imageDataWritten = reread->GetImageData();
+ uint8_t *imageDataWritten = reread->GetImageData();
//////////////// Step 4:
// Test the image size
- if (header->GetXSize() != reread->GetHeader()->GetXSize() ||
- header->GetYSize() != reread->GetHeader()->GetYSize() ||
- header->GetZSize() != reread->GetHeader()->GetZSize())
+ if (file->GetXSize() != reread->GetFile()->GetXSize() ||
+ file->GetYSize() != reread->GetFile()->GetYSize() ||
+ file->GetZSize() != reread->GetFile()->GetZSize())
{
std::cout << "Failed" << std::endl
<< " X Size differs: "
- << "X: " << header->GetXSize() << " # "
- << reread->GetHeader()->GetXSize() << " | "
- << "Y: " << header->GetYSize() << " # "
- << reread->GetHeader()->GetYSize() << " | "
- << "Z: " << header->GetZSize() << " # "
- << reread->GetHeader()->GetZSize() << std::endl;
- delete header;
- delete file;
- delete reread;
+ << "X: " << file->GetXSize() << " # "
+ << reread->GetFile()->GetXSize() << " | "
+ << "Y: " << file->GetYSize() << " # "
+ << reread->GetFile()->GetYSize() << " | "
+ << "Z: " << file->GetZSize() << " # "
+ << reread->GetFile()->GetZSize() << std::endl;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 1;
}
std::cout << "Failed" << std::endl
<< " Pixel areas lengths differ: "
<< dataSize << " # " << dataSizeWritten << std::endl;
- delete header;
- delete file;
- delete reread;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 1;
}
// Test the data's content
- if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0)
+ if (memcmp(imageData, imageDataWritten, dataSize) !=0)
{
- (void)res;
std::cout << "Failed" << std::endl
<< " Pixel differ (as expanded in memory)." << std::endl;
- delete header;
- delete file;
- delete reread;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 1;
}
std::cout << "4...OK." << std::endl ;
//////////////// Clean up:
- delete header;
- delete file;
- delete reread;
+ file->Delete();
+ filehelper->Delete();
+ fileout->Delete();
+ reread->Delete();
return 0;
}
-int TestReadWriteReadCompare(int argc, char* argv[])
+int TestReadWriteReadCompare(int argc, char *argv[])
{
int result = 0;
- if (argc == 3)
+
+ if (argc == 4)
+ gdcm::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
{
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
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff