X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestFileAccessors.cxx;h=8be0e831db225953eabe9a396c9a61faa9d9a781;hb=4695af60407895e5f0851ffcb9afdb138c9870f7;hp=5a55f1069e2ae9c58105ffa2254ee42f746074df;hpb=c74bc8cb4308864bd6e9c4f1bdf96d7af51c0ef2;p=gdcm.git diff --git a/Testing/TestFileAccessors.cxx b/Testing/TestFileAccessors.cxx index 5a55f106..8be0e831 100644 --- a/Testing/TestFileAccessors.cxx +++ b/Testing/TestFileAccessors.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestFileAccessors.cxx,v $ Language: C++ - Date: $Date: 2005/02/03 09:51:53 $ - Version: $Revision: 1.1 $ + Date: $Date: 2005/07/08 13:39:57 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -50,85 +50,87 @@ int TestFileAccessors(int, char *[]) std::string filename = GDCM_DATA_ROOT; filename += "/"; //doh! filename += gdcmDataImages[i]; - - gdcm::File *e1= new gdcm::File( filename ); + + gdcm::File *f= new gdcm::File( ); + f->SetFileName( filename ); + f->Load( ); // We don't check the returned values // We just want to be sure no accessor seg faults on any image ... // And this will improve test coverage ;-) - std::cout << "GetSwapCode()" << e1->GetSwapCode() << std::endl; - std::cout << "GetImageNumber()" << e1->GetImageNumber() << std::endl; - std::cout << "GetModality()" << e1->GetModality() << std::endl; - std::cout << "GetXSize()" << e1->GetXSize() << std::endl; - std::cout << "GetYSize()" << e1->GetYSize() << std::endl; - std::cout << "GetZSize()" << e1->GetZSize() << std::endl; - std::cout << "GetXSpacing()" << e1->GetXSpacing() << std::endl; - std::cout << "GetYSpacing()" << e1->GetYSpacing() << std::endl; - std::cout << "GetZSpacing()" << e1->GetZSpacing() << std::endl; - std::cout << "GetXOrigin()" << e1->GetXOrigin() << std::endl; - std::cout << "GetYOrigin()" << e1->GetYOrigin() << std::endl; - std::cout << "GetZOrigin()" << e1->GetZOrigin() << std::endl; - std::cout << "GetBitsStored()" << e1->GetBitsStored() << std::endl; - std::cout << "GetBitsAllocated()" << e1->GetBitsAllocated() << std::endl; - std::cout << "GetHighBitPosition()" << e1->GetHighBitPosition() << std::endl; - std::cout << "GetSamplesPerPixel()" << e1->GetSamplesPerPixel() << std::endl; - std::cout << "GetPlanarConfiguration()" << e1->GetPlanarConfiguration() << std::endl; - std::cout << "GetPixelSize()" << e1->GetPixelSize() << std::endl; - std::cout << "GetPixelType()" << e1->GetPixelType() << std::endl; - std::cout << "GetLUTNbits()" << e1->GetLUTNbits() << std::endl; - std::cout << "GetRescaleIntercept()" << e1->GetRescaleIntercept() << std::endl; - std::cout << "GetRescaleSlope()" << e1->GetRescaleSlope() << std::endl; - std::cout << "GetGrPixel()" << std::hex << e1->GetGrPixel() << std::endl; - std::cout << "GetNumPixel()" << std::hex << e1->GetNumPixel() << std::endl; - std::cout << "GetPixelOffset()" << e1->GetPixelOffset() << std::endl; - - std::cout << "GetPixelAreaLength()" << e1->GetPixelAreaLength()<< std::endl; - std::cout << "GetNumberOfScalarComponents()" << e1->GetNumberOfScalarComponents()<< std::endl; - std::cout << "GetNumberOfScalarComponentsRaw()" << e1->GetNumberOfScalarComponentsRaw()<< std::endl; - std::cout << "IsSignedPixelData()" << e1->IsSignedPixelData()<< std::endl; - std::cout << "IsMonochrome()" << e1->IsMonochrome() << std::endl; - std::cout << "IsPaletteColor()" << e1->IsPaletteColor() << std::endl; - std::cout << "IsYBRFull()" << e1->IsYBRFull() << std::endl; - std::cout << "HasLut() " << e1->HasLUT() << std::endl; - std::cout << "GetTransferSyntax()" << e1->GetTransferSyntax() << std::endl; - std::cout << "GetTransferSyntaxName()" << e1->GetTransferSyntaxName() << std::endl; - std::cout << "GetFileType()" << e1->GetFileType() << std::endl; - std::cout << "GetFileName()" << e1->GetFileName() << std::endl; - - e1->GetImageOrientationPatient( iop ); + std::cout << "GetSwapCode()" << f->GetSwapCode() << std::endl; + std::cout << "GetImageNumber()" << f->GetImageNumber() << std::endl; + std::cout << "GetModality()" << f->GetModality() << std::endl; + std::cout << "GetXSize()" << f->GetXSize() << std::endl; + std::cout << "GetYSize()" << f->GetYSize() << std::endl; + std::cout << "GetZSize()" << f->GetZSize() << std::endl; + std::cout << "GetXSpacing()" << f->GetXSpacing() << std::endl; + std::cout << "GetYSpacing()" << f->GetYSpacing() << std::endl; + std::cout << "GetZSpacing()" << f->GetZSpacing() << std::endl; + std::cout << "GetXOrigin()" << f->GetXOrigin() << std::endl; + std::cout << "GetYOrigin()" << f->GetYOrigin() << std::endl; + std::cout << "GetZOrigin()" << f->GetZOrigin() << std::endl; + std::cout << "GetBitsStored()" << f->GetBitsStored() << std::endl; + std::cout << "GetBitsAllocated()" << f->GetBitsAllocated() << std::endl; + std::cout << "GetHighBitPosition()" << f->GetHighBitPosition() << std::endl; + std::cout << "GetSamplesPerPixel()" << f->GetSamplesPerPixel() << std::endl; + std::cout << "GetPlanarConfiguration()" << f->GetPlanarConfiguration() << std::endl; + std::cout << "GetPixelSize()" << f->GetPixelSize() << std::endl; + std::cout << "GetPixelType()" << f->GetPixelType() << std::endl; + std::cout << "GetLUTNbits()" << f->GetLUTNbits() << std::endl; + std::cout << "GetRescaleIntercept()" << f->GetRescaleIntercept() << std::endl; + std::cout << "GetRescaleSlope()" << f->GetRescaleSlope() << std::endl; + std::cout << "GetGrPixel()" << std::hex << f->GetGrPixel() << std::endl; + std::cout << "GetNumPixel()" << std::hex << f->GetNumPixel() << std::endl; + std::cout << "GetPixelOffset()" << f->GetPixelOffset() << std::endl; + + std::cout << "GetPixelAreaLength()" << f->GetPixelAreaLength()<< std::endl; + std::cout << "GetNumberOfScalarComponents()" << f->GetNumberOfScalarComponents()<< std::endl; + std::cout << "GetNumberOfScalarComponentsRaw()" << f->GetNumberOfScalarComponentsRaw()<< std::endl; + std::cout << "IsSignedPixelData()" << f->IsSignedPixelData()<< std::endl; + std::cout << "IsMonochrome()" << f->IsMonochrome() << std::endl; + std::cout << "IsPaletteColor()" << f->IsPaletteColor() << std::endl; + std::cout << "IsYBRFull()" << f->IsYBRFull() << std::endl; + std::cout << "HasLut() " << f->HasLUT() << std::endl; + std::cout << "GetTransferSyntax()" << f->GetTransferSyntax() << std::endl; + std::cout << "GetTransferSyntaxName()" << f->GetTransferSyntaxName() << std::endl; + std::cout << "GetFileType()" << f->GetFileType() << std::endl; + std::cout << "GetFileName()" << f->GetFileName() << std::endl; + + f->GetImageOrientationPatient( iop ); for (int j=0; j<6; j++) std::cout << "iop[" << j << "] = " << iop[j] << std::endl; - if( e1->IsReadable() ) + if( f->IsReadable() ) { std::cout <GetImageDataSize() << std::endl; - std::cout << "GetImageDataRawSize()" << fh1->GetImageDataRawSize() << std::endl; + std::cout << "GetImageDataSize()" << fh->GetImageDataSize() << std::endl; + std::cout << "GetImageDataRawSize()" << fh->GetImageDataRawSize() << std::endl; // User Data - std::cout << "GetRGBDataSize()" << fh1->GetRGBDataSize() << std::endl; - std::cout << "GetRawDataSize()" << fh1->GetRawDataSize() << std::endl; - std::cout << "GetUserDataSize()" << fh1->GetUserDataSize() << std::endl; + std::cout << "GetRGBDataSize()" << fh->GetRGBDataSize() << std::endl; + std::cout << "GetRawDataSize()" << fh->GetRawDataSize() << std::endl; + std::cout << "GetUserDataSize()" << fh->GetUserDataSize() << std::endl; - std::cout << "GetWriteType()" << fh1->GetWriteType() << std::endl; + std::cout << "GetWriteType()" << fh->GetWriteType() << std::endl; - delete fh1; + delete fh; } else { std::cout << filename << " is NOT Readable" << std::endl << std::endl; - delete e1; + delete f; return 1; } - delete e1; + delete f; i++; } return 0;