X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=fe79c983ddf3cf7c632ece400997683e00feb15a;hb=55549bad693bd883a36acace3a3bbd265f95dd13;hp=3b1dc14b4bd242b85629db4b76ffa7c40da24566;hpb=fe9f5b22e228eb450c40a44c637ea6c1b1e6c631;p=gdcm.git diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 3b1dc14b..fe79c983 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/01/08 23:18:31 $ - Version: $Revision: 1.11 $ + Date: $Date: 2005/02/07 18:43:38 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,8 +22,9 @@ * The image content is a horizontal grayscale from * */ -#include "gdcmHeader.h" #include "gdcmFile.h" +#include "gdcmFileHelper.h" +#include "gdcmDebug.h" #include #include @@ -62,7 +63,14 @@ Image Images [] = { {256, 512, 1, 1, 16, 16, 0, 'a'}, {256, 512, 1, 1, 16, 16, 0, 'e'}, {256, 512, 1, 1, 16, 16, 0, 'i'}, - {0, 0, 1, 1, 8, 8, 0, 'i'} // to find the end + + {512, 256, 10, 1, 8, 8, 0, 'a'}, + {512, 256, 10, 1, 8, 8, 0, 'e'}, + {512, 256, 10, 1, 8, 8, 0, 'i'}, + {512, 256, 10, 3, 8, 8, 0, 'a'}, + {512, 256, 10, 3, 8, 8, 0, 'e'}, + {512, 256, 10, 3, 8, 8, 0, 'i'}, + {0, 0, 1, 1, 8, 8, 0, 'i'} // to find the end }; int WriteSimple(Image &img) @@ -71,54 +79,66 @@ int WriteSimple(Image &img) // Step 1 : Create the header of the image std::cout << " 1..."; - gdcm::Header *header = new gdcm::Header(); + gdcm::File *fileToBuild = new gdcm::File(); std::ostringstream str; // Set the image size str.str(""); str << img.sizeX; - header->ReplaceOrCreate(str.str(),0x0028,0x0011); // Columns + fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns str.str(""); str << img.sizeY; - header->ReplaceOrCreate(str.str(),0x0028,0x0010); // Rows + fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows if(img.sizeZ>1) { str.str(""); str << img.sizeZ; - header->ReplaceOrCreate(str.str(),0x0028,0x0008); // Number of Frames + fileToBuild->InsertValEntry(str.str(),0x0028,0x0008); // Number of Frames } // Set the pixel type str.str(""); str << img.componentSize; - header->ReplaceOrCreate(str.str(),0x0028,0x0100); // Bits Allocated + fileToBuild->InsertValEntry(str.str(),0x0028,0x0100); // Bits Allocated + + /******************************************/ + /******************************************/ + // Super duper kludge !! + if( img.componentSize == 16 ) + { + // I guess by design user should know that... + fileToBuild->InsertBinEntry(0,0, 0x7fe0, 0x0010, "OW"); + } + /******************************************/ + /******************************************/ + str.str(""); str << img.componentUse; - header->ReplaceOrCreate(str.str(),0x0028,0x0101); // Bits Stored + fileToBuild->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored str.str(""); str << img.componentSize - 1; - header->ReplaceOrCreate(str.str(),0x0028,0x0102); // High Bit + fileToBuild->InsertValEntry(str.str(),0x0028,0x0102); // High Bit // Set the pixel representation str.str(""); str << img.sign; - header->ReplaceOrCreate(str.str(),0x0028,0x0103); // Pixel Representation + fileToBuild->InsertValEntry(str.str(),0x0028,0x0103); // Pixel Representation // Set the samples per pixel str.str(""); str << img.components; - header->ReplaceOrCreate(str.str(),0x0028,0x0002); // Samples per Pixel + fileToBuild->InsertValEntry(str.str(),0x0028,0x0002); // Samples per Pixel - if( !header->IsReadable() ) + if( !fileToBuild->IsReadable() ) { std::cout << "Failed\n" << " Prepared image isn't readable\n"; - delete header; + delete fileToBuild; return 1; } @@ -147,7 +167,7 @@ int WriteSimple(Image &img) { *(tmp+1) = j/256; } - tmp += img.componentSize * img.components/8; + tmp += img.components/8; } } } @@ -155,7 +175,7 @@ int WriteSimple(Image &img) // Step 3 : Create the file of the image std::cout << "3..."; - gdcm::File *file = new gdcm::File(header); + gdcm::FileHelper *file = new gdcm::FileHelper(fileToBuild); file->SetImageData(imageData,size); // Step 4 : Set the writting mode and write the image @@ -181,7 +201,7 @@ int WriteSimple(Image &img) << " Write mode '"<GetHeader()->IsReadable() ) + gdcm::FileHelper *reread = new gdcm::FileHelper( fileName ); + if( !reread->GetFile()->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::cerr << "Failed" << std::endl + << "Could not reread image written: " << fileName << std::endl; + delete fileToBuild; + delete file; + delete reread; + delete[] imageData; + return 1; } // Step 6 : Compare to the written image std::cout << "6..."; size_t dataSizeWritten = reread->GetImageDataSize(); - uint8_t* imageDataWritten = reread->GetImageData(); + uint8_t *imageDataWritten = reread->GetImageData(); // Test the image size - if (header->GetXSize() != reread->GetHeader()->GetXSize() || - header->GetYSize() != reread->GetHeader()->GetYSize() || - header->GetZSize() != reread->GetHeader()->GetZSize()) + if (fileToBuild->GetXSize() != reread->GetFile()->GetXSize() || + fileToBuild->GetYSize() != reread->GetFile()->GetYSize() || + fileToBuild->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; + << "X: " << fileToBuild->GetXSize() << " # " + << reread->GetFile()->GetXSize() << " | " + << "Y: " << fileToBuild->GetYSize() << " # " + << reread->GetFile()->GetYSize() << " | " + << "Z: " << fileToBuild->GetZSize() << " # " + << reread->GetFile()->GetZSize() << std::endl; + delete fileToBuild; delete file; delete reread; delete[] imageData; @@ -243,7 +263,7 @@ int WriteSimple(Image &img) std::cout << "Failed" << std::endl << " Pixel areas lengths differ: " << size << " # " << dataSizeWritten << std::endl; - delete header; + delete fileToBuild; delete file; delete reread; delete[] imageData; @@ -257,7 +277,7 @@ int WriteSimple(Image &img) (void)res; std::cout << "Failed" << std::endl << " Pixel differ (as expanded in memory)." << std::endl; - delete header; + delete fileToBuild; delete file; delete reread; delete[] imageData; @@ -267,7 +287,7 @@ int WriteSimple(Image &img) std::cout << "OK" << std::endl; - delete header; + delete fileToBuild; delete file; delete reread; delete[] imageData; @@ -275,7 +295,7 @@ int WriteSimple(Image &img) return 0; } -int TestWriteSimple(int argc, char* argv[]) +int TestWriteSimple(int argc, char *argv[]) { if (argc < 1) {