From 6cd5e266680c7a2f8291575bf4670352115e0af7 Mon Sep 17 00:00:00 2001 From: jpr Date: Wed, 2 Feb 2005 10:44:21 +0000 Subject: [PATCH] Remove useless file --- Example/CMakeLists.txt | 1 - Example/TestReadWriteReadCompare.cxx | 149 -------------------------- Example/Write.cxx | 154 --------------------------- 3 files changed, 304 deletions(-) delete mode 100644 Example/TestReadWriteReadCompare.cxx delete mode 100644 Example/Write.cxx diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index 1a34905d..b76c2471 100644 --- a/Example/CMakeLists.txt +++ b/Example/CMakeLists.txt @@ -16,7 +16,6 @@ SET(EXAMPLE_SOURCES TestCopyDicom TestChangeHeader TestFromScratch - TestReadWriteReadCompare TestPapyrus TestWrite TestWriteSimple diff --git a/Example/TestReadWriteReadCompare.cxx b/Example/TestReadWriteReadCompare.cxx deleted file mode 100644 index 98a3a08a..00000000 --- a/Example/TestReadWriteReadCompare.cxx +++ /dev/null @@ -1,149 +0,0 @@ -/*========================================================================= - - Program: gdcm - Module: $RCSfile: TestReadWriteReadCompare.cxx,v $ - Language: C++ - Date: $Date: 2005/02/02 10:06:32 $ - Version: $Revision: 1.10 $ - - 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" - -//Generated file: -#include "gdcmDataImages.h" - -int main(int argc, char *argv[]) -{ - if (argc<2) - { - std::cerr << "Test::TestReadWriteReadCompare: Usage: " << argv[0] - << " fileToCheck.dcm " << std::endl; - } - - std::cout<< "Test::TestReadWriteReadCompare: description " << std::endl; - 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 gdcmFile) and call" - << " IsReadable(). " << std::endl; - std::cout << " step 2: write the corresponding image in DICOM V3 " - << "with explicit" << std::endl - << " Value Representation in temporary file " - << "TestReadWriteReadCompare.dcm." << std::endl; - std::cout << " step 3: read the image written on step2 and call " - << " IsReadable(). " << std::endl; - std::cout << " step 4: compare (in memory with memcmp) that the two " - << "images " << std::endl - << " match (as expanded by gdcm)." << std::endl; - - //int i = 0; - //while( gdcmDataImages[i] != 0 ) - { - std::string filename = GDCM_DATA_ROOT; - filename += "/"; - //filename += gdcmDataImages[i++]; - filename +=argv[1]; - - std::cout << " Testing: " << filename << std::endl; - - //////////////// Step 1 (see above description): - - gdcm::File *header = new gdcm::File( filename ); - if( !header->IsReadable() ) - { - std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:" - << filename << std::endl; - delete header; - 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 - // 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 ? - - file->SetImageData(imageData, dataSize); - - file->WriteDcmExplVR( "TestReadWriteReadCompare.dcm" ); - std::cout << "2..."; - - //////////////// Step 3: - - gdcm::FileHelper *reread = new gdcm::FileHelper( "TestReadWriteReadCompare.dcm" ); - if( !reread->GetFile()->IsReadable() ) - { - std::cerr << "Test::TestReadWriteReadCompare: Could not reread image " - << "written:" << filename << std::endl; - delete header; - delete file; - delete reread; - return 1; - } - std::cout << "3..."; - // For the next step: - int dataSizeWritten = reread->GetImageDataSize(); - uint8_t *imageDataWritten = reread->GetImageData(); - - //////////////// Step 4: - - if (dataSize != dataSizeWritten) - { - std::cout << std::endl - << " Pixel areas lengths differ: " - << dataSize << " # " << dataSizeWritten << std::endl; - delete header; - delete file; - delete reread; - return 1; - } - - if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0) - { - (void)res; - std::cout << std::endl - << " Pixel differ (as expanded in memory)." << std::endl; - delete header; - delete file; - delete reread; - return 1; - } - std::cout << "4...OK." << std::endl ; - - //////////////// Clean up: - delete header; - delete file; - delete reread; - } - - return 0; -} diff --git a/Example/Write.cxx b/Example/Write.cxx deleted file mode 100644 index 5a864870..00000000 --- a/Example/Write.cxx +++ /dev/null @@ -1,154 +0,0 @@ -/*========================================================================= - - Program: gdcm - Module: $RCSfile: Write.cxx,v $ - Language: C++ - Date: $Date: 2005/02/02 10:06:32 $ - Version: $Revision: 1.19 $ - - 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 - -int main(int argc, char *argv[]) -{ - std::string FileNameToWrite; - - gdcm::File *e1; - gdcm::FileHelper *f1; - - uint8_t *imageData; - int dataSize; - - if (argc < 3) { - std::cerr << "usage: " << std::endl - << argv[0] << " fileName writtingMode " - << std::endl - << "(a : ACR, d : DICOM Implicit VR," - << " x : DICOM Explicit VR, r : RAW)" - << std::endl; - return 0; - } -/* - if (0) { // Just to keep the code for further use - std::cout <GetFile()->IsReadable()) { - std::cout << "Sorry, not a DICOM / ACR File" < after new gdcmFile" - << std::endl; - e1->PrintEntry(); - std::cout <IsReadable()) { - std::cerr << "Sorry, not a Readable DICOM / ACR File" <Print(); - - f1 = new gdcm::FileHelper(e1); -// --- - - dataSize = f1->GetImageDataSize(); - std::cout <GetXSize(); - nY=e1->GetYSize(); - nZ=e1->GetZSize(); - std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ << std::endl; - - pixelType = e1->GetPixelType(); - sPP = e1->GetSamplesPerPixel(); - planarConfig = e1->GetPlanarConfiguration(); - - std::cout << " pixelType=" << pixelType - << " SampleserPixel=" << sPP - << " PlanarConfiguration=" << planarConfig - << " PhotometricInterpretation=" - << e1->GetEntryValue(0x0028,0x0004) - << std::endl; - - int numberOfScalarComponents=e1->GetNumberOfScalarComponents(); - std::cout << "NumberOfScalarComponents " << numberOfScalarComponents <GetTransferSyntaxName(); - std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl; - -/* if ( transferSyntaxName != "Implicit VR - Little Endian" - && transferSyntaxName != "Explicit VR - Little Endian" - && transferSyntaxName != "Deflated Explicit VR - Little Endian" - && transferSyntaxName != "Explicit VR - Big Endian" - && transferSyntaxName != "Uncompressed ACR-NEMA" ) { - std::cout << std::endl << "===========================================" - << std::endl; - f1->GetPixelReadConverter()->Print(); - std::cout << std::endl << "===========================================" - << std::endl; - }*/ - imageData= f1->GetImageData(); - (void)imageData; // to avoid warnings - - switch (argv[2][0]) - { - case 'a' : - // ecriture d'un fichier ACR - // à partir d'un dcmFile correct. - - FileNameToWrite = FileName + ".ACR"; - std::cout << "WriteACR" << std::endl; - f1->WriteAcr(FileNameToWrite); - break; - - case 'd' : - // ecriture d'un fichier DICOM Implicit VR - // à partir d'un dcmFile correct. - - FileNameToWrite = FileName + ".DCM"; - std::cout << "WriteDCM Implicit VR" << std::endl; - f1->WriteDcmImplVR(FileNameToWrite); - break; - - case 'x' : - // ecriture d'un fichier DICOM Explicit VR - // à partir d'un dcmFile correct. - - FileNameToWrite = FileName + ".DCM"; - std::cout << "WriteDCM Implicit VR" << std::endl; - f1->WriteDcmExplVR(FileNameToWrite); - break; - - case 'r' : - // Ecriture d'un Raw File, a afficher avec - // affim filein= dimx= dimy= nbit= signe= - - FileNameToWrite = FileName + ".RAW"; - std::cout << "WriteRaw" << std::endl; - f1->WriteRawData(FileNameToWrite); - break; - - } - return 0; -} - -- 2.45.1