X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=3bb432b8f78957386fad2087e84b2a9e83a2e9c7;hb=12a9e3dc2ee708f43310fe9f2b573fa3213f1c04;hp=6958b8a35830d06b756581be2b31df578ab1c4e2;hpb=432b93bf6d722039bcb49a17cfb277c860407d68;p=gdcm.git diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 6958b8a3..3bb432b8 100644 --- a/Testing/TestWriteSimple.cxx +++ b/Testing/TestWriteSimple.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestWriteSimple.cxx,v $ Language: C++ - Date: $Date: 2005/10/11 14:24:29 $ - Version: $Revision: 1.38 $ + Date: $Date: 2005/10/25 16:43:46 $ + Version: $Revision: 1.43 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -48,7 +48,6 @@ Image Images [] = { {256, 256, 1, 1, 8, 8, 0, 'a'}, {256, 256, 1, 1, 8, 8, 0, 'e'}, {256, 256, 1, 1, 8, 8, 0, 'i'}, - {512, 256, 1, 1, 8, 8, 0, 'a'}, {512, 256, 1, 1, 8, 8, 0, 'e'}, {512, 256, 1, 1, 8, 8, 0, 'i'}, @@ -99,31 +98,38 @@ Image Images [] = { {0, 0, 1, 1, 8, 8, 0, 'i'} // to find the end }; + +const unsigned int MAX_NUMBER_OF_DIFFERENCE = 10; + int WriteSimple(Image &img) { std::ostringstream fileName; fileName.str(""); fileName << "TestWriteSimple"; -// Step 1 : Create the header of the image +// Step 1 : Create an empty FileHelper std::cout << " 1..."; - gdcm::File *fileToBuild = new gdcm::File(); + gdcm::FileHelper *fileH = gdcm::FileHelper::New(); + + // Get the (empty) image header. + gdcm::File *fileToBuild = fileH->GetFile() + ; std::ostringstream str; // Set the image size str.str(""); str << img.sizeX; - fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns + fileToBuild->InsertEntryString(str.str(),0x0028,0x0011); // Columns str.str(""); str << img.sizeY; - fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows + fileToBuild->InsertEntryString(str.str(),0x0028,0x0010); // Rows if(img.sizeZ>1) { str.str(""); str << img.sizeZ; - fileToBuild->InsertValEntry(str.str(),0x0028,0x0008); // Number of Frames + fileToBuild->InsertEntryString(str.str(),0x0028,0x0008); // Number of Frames } fileName << "-" << img.sizeX << "-" << img.sizeY << "-" << img.sizeZ; @@ -131,20 +137,20 @@ int WriteSimple(Image &img) // Set the pixel type str.str(""); str << img.componentSize; - fileToBuild->InsertValEntry(str.str(),0x0028,0x0100); // Bits Allocated + fileToBuild->InsertEntryString(str.str(),0x0028,0x0100); // Bits Allocated str.str(""); str << img.componentUse; - fileToBuild->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored + fileToBuild->InsertEntryString(str.str(),0x0028,0x0101); // Bits Stored str.str(""); str << ( img.componentSize - 1 ); - fileToBuild->InsertValEntry(str.str(),0x0028,0x0102); // High Bit + fileToBuild->InsertEntryString(str.str(),0x0028,0x0102); // High Bit // Set the pixel representation str.str(""); str << img.sign; - fileToBuild->InsertValEntry(str.str(),0x0028,0x0103); // Pixel Representation + fileToBuild->InsertEntryString(str.str(),0x0028,0x0103); // Pixel Representation fileName << "-" << img.componentSize; if(img.sign == 0) @@ -163,11 +169,10 @@ int WriteSimple(Image &img) } std::cout << "[" << fileName.str() << "]..."; - // Set the samples per pixel str.str(""); str << img.components; - fileToBuild->InsertValEntry(str.str(),0x0028,0x0002); // Samples per Pixel + fileToBuild->InsertEntryString(str.str(),0x0028,0x0002); // Samples per Pixel // Step 2 : Create the output image std::cout << "2..."; @@ -200,9 +205,8 @@ int WriteSimple(Image &img) } } -// Step 3 : Create the file of the image +// Step 3 : Set the image Pixel Data std::cout << "3..."; - gdcm::FileHelper *fileH = new gdcm::FileHelper(fileToBuild); fileH->SetImageData(imageData,size); // Step 4 : Set the writting mode and write the image @@ -227,8 +231,7 @@ int WriteSimple(Image &img) std::cout << "Failed for [" << fileName.str() << "]\n" << " Write mode '"<Delete(); delete[] imageData; return 1; } @@ -236,10 +239,10 @@ int WriteSimple(Image &img) if( !fileH->Write(fileName.str()) ) { std::cout << "Failed for [" << fileName.str() << "]\n" - << " File in unwrittable\n"; + << " File is unwrittable\n"; + + fileH->Delete(); - delete fileH; - delete fileToBuild; delete[] imageData; return 1; } @@ -249,10 +252,10 @@ int WriteSimple(Image &img) // old form. //gdcm::FileHelper *reread = new gdcm::FileHelper( fileName.str() ); // Better use : - gdcm::FileHelper *reread = new gdcm::FileHelper( ); + gdcm::FileHelper *reread = gdcm::FileHelper::New( ); reread->SetFileName( fileName.str() ); - reread->SetLoadMode(0); // Load everything - // Other possible values are + reread->SetLoadMode(gdcm::LD_ALL); // Load everything + // Possible values are // gdcm::LD_ALL, // gdcm::LD_NOSEQ, // gdcm::LD_NOSHADOW, @@ -264,9 +267,9 @@ int WriteSimple(Image &img) { std::cerr << "Failed" << std::endl << "Could not read written image : " << fileName.str() << std::endl; - delete fileToBuild; - delete fileH; - delete reread; + fileToBuild->Delete(); + fileH->Delete(); + reread->Delete(); delete[] imageData; return 1; } @@ -283,9 +286,9 @@ int WriteSimple(Image &img) << " File type differ: " << fileH->GetWriteType() << " # " << reread->GetFile()->GetFileType() << std::endl; - delete fileToBuild; - delete fileH; - delete reread; + fileToBuild->Delete(); + fileH->Delete(); + reread->Delete(); delete[] imageData; return 1; @@ -304,9 +307,9 @@ int WriteSimple(Image &img) << reread->GetFile()->GetYSize() << " | " << "Z: " << fileToBuild->GetZSize() << " # " << reread->GetFile()->GetZSize() << std::endl; - delete fileToBuild; - delete fileH; - delete reread; + fileToBuild->Delete(); + fileH->Delete(); + reread->Delete(); delete[] imageData; return 1; @@ -318,9 +321,9 @@ int WriteSimple(Image &img) std::cout << "Failed" << std::endl << " Pixel areas lengths differ: " << size << " # " << dataSizeWritten << std::endl; - delete fileToBuild; - delete fileH; - delete reread; + fileToBuild->Delete(); + fileH->Delete(); + reread->Delete(); delete[] imageData; return 1; @@ -331,9 +334,26 @@ int WriteSimple(Image &img) { std::cout << "Failed" << std::endl << " Pixel differ (as expanded in memory)." << std::endl; - delete fileToBuild; - delete fileH; - delete reread; + std::cout << " list of the first " << MAX_NUMBER_OF_DIFFERENCE + << " pixels differing (pos : test - ref) :" + << std::endl; + unsigned int i; + unsigned int j; + for(i=0, j=0;iDelete(); + fileH->Delete(); + reread->Delete(); delete[] imageData; return 1; @@ -341,9 +361,9 @@ int WriteSimple(Image &img) std::cout << "OK" << std::endl; - delete fileToBuild; - delete fileH; - delete reread; + fileToBuild->Delete(); + fileH->Delete(); + reread->Delete(); delete[] imageData; return 0; @@ -359,7 +379,7 @@ int TestWriteSimple(int argc, char *argv[]) return 1; } - // gdcm::Debug::DebugOn(); + gdcm::Debug::DebugOn(); int ret=0; int i=0;