X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=f16d153fd532aadacb38b62ae2d39b41a476eb3e;hb=54fadb4c545adbec700c83306407a8fb75c9e844;hp=531d9f0b3252bb1e3137cd66e9e6655fcfd74a5a;hpb=33ea6274972a853d1214fc5e6ea31309ec7e2ad8;p=gdcm.git diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 531d9f0b..f16d153f 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/02/07 12:53:59 $ - Version: $Revision: 1.20 $ + Date: $Date: 2005/03/09 09:45:33 $ + 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 @@ -64,18 +64,46 @@ Image Images [] = { {256, 512, 1, 1, 16, 16, 0, 'e'}, {256, 512, 1, 1, 16, 16, 0, 'i'}, - {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 + {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'}, + + {256, 256, 1, 1, 8, 8, 1, 'a'}, + {256, 256, 1, 1, 8, 8, 1, 'e'}, + {256, 256, 1, 1, 8, 8, 1, 'i'}, + + {512, 256, 1, 1, 8, 8, 1, 'a'}, + {512, 256, 1, 1, 8, 8, 1, 'e'}, + {512, 256, 1, 1, 8, 8, 1, 'i'}, + + {256, 512, 1, 1, 8, 8, 1, 'a'}, + {256, 512, 1, 1, 8, 8, 1, 'e'}, + {256, 512, 1, 1, 8, 8, 1, 'i'}, + + {256, 512, 1, 1, 16, 16, 1, 'a'}, + {256, 512, 1, 1, 16, 16, 1, 'e'}, + {256, 512, 1, 1, 16, 16, 1, 'i'}, + {256, 512, 1, 1, 16, 16, 1, 'a'}, + {256, 512, 1, 1, 16, 16, 1, 'e'}, + {256, 512, 1, 1, 16, 16, 1, 'i'}, + + {512, 256, 10, 1, 8, 8, 1, 'a'}, + {512, 256, 10, 1, 8, 8, 1, 'e'}, + {512, 256, 10, 1, 8, 8, 1, 'i'}, + {512, 256, 10, 3, 8, 8, 1, 'a'}, + {512, 256, 10, 3, 8, 8, 1, 'e'}, + {512, 256, 10, 3, 8, 8, 1, 'i'}, + {0, 0, 1, 1, 8, 8, 0, 'i'} // to find the end }; int WriteSimple(Image &img) { - std::string fileName = "TestWriteSimple.dcm"; + std::ostringstream fileName; + fileName.str(""); + fileName << "TestWriteSimple"; // Step 1 : Create the header of the image std::cout << " 1..."; @@ -86,7 +114,6 @@ int WriteSimple(Image &img) str.str(""); str << img.sizeX; fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns - str.str(""); str << img.sizeY; fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows @@ -98,23 +125,13 @@ int WriteSimple(Image &img) fileToBuild->InsertValEntry(str.str(),0x0028,0x0008); // Number of Frames } + fileName << "-" << img.sizeX << "-" << img.sizeY << "-" << img.sizeZ; + // Set the pixel type str.str(""); str << img.componentSize; 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; fileToBuild->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored @@ -128,6 +145,22 @@ int WriteSimple(Image &img) str << img.sign; fileToBuild->InsertValEntry(str.str(),0x0028,0x0103); // Pixel Representation + fileName << "-" << img.componentSize; + if(img.sign == 0) + fileName << "U"; + else + fileName << "S"; + + switch (img.writeMode) + { + case 'a' : + fileName << ".ACR"; break; + case 'e' : + fileName << ".EXPL"; break; + case 'i' : + fileName << ".IMPL"; break; +} + // Set the samples per pixel str.str(""); str << img.components; @@ -152,7 +185,7 @@ int WriteSimple(Image &img) * img.components * img.componentSize / 8; unsigned char *imageData = new unsigned char[size]; - // FIXME : find a best heuristic to create the image + // FIXME : find a better heuristic to create the image unsigned char *tmp = imageData; for(int k=0;kWrite(fileName) ) + if( !file->Write(fileName.str()) ) { std::cout << "Failed\n" << "File in unwrittable\n"; @@ -219,15 +252,16 @@ int WriteSimple(Image &img) // Step 5 : Read the written image std::cout << "5..."; - gdcm::FileHelper *reread = new gdcm::FileHelper( fileName ); + gdcm::FileHelper *reread = new gdcm::FileHelper( fileName.str() ); if( !reread->GetFile()->IsReadable() ) { - std::cerr << "Failed" << std::endl - << "Could not reread image written: " << fileName << std::endl; - delete fileToBuild; - delete file; - delete reread; - return 1; + std::cerr << "Failed" << std::endl + << "Could not read written image : " << fileName << std::endl; + delete fileToBuild; + delete file; + delete reread; + delete[] imageData; + return 1; } // Step 6 : Compare to the written image @@ -235,6 +269,21 @@ int WriteSimple(Image &img) size_t dataSizeWritten = reread->GetImageDataSize(); uint8_t *imageDataWritten = reread->GetImageData(); + // Test the image write mode + if (reread->GetFile()->GetFileType() != file->GetWriteType()) + { + std::cout << "Failed" << std::endl + << " File type differ: " + << file->GetWriteType() << " # " + << reread->GetFile()->GetFileType() << std::endl; + delete fileToBuild; + delete file; + delete reread; + delete[] imageData; + + return 1; + } + // Test the image size if (fileToBuild->GetXSize() != reread->GetFile()->GetXSize() || fileToBuild->GetYSize() != reread->GetFile()->GetYSize() || @@ -271,9 +320,8 @@ int WriteSimple(Image &img) } // Test the data's content - if (int res = memcmp(imageData, imageDataWritten, size) !=0) + if ( memcmp(imageData, imageDataWritten, size) !=0 ) { - (void)res; std::cout << "Failed" << std::endl << " Pixel differ (as expanded in memory)." << std::endl; delete fileToBuild; @@ -304,11 +352,14 @@ int TestWriteSimple(int argc, char *argv[]) return 1; } + //gdcm::Debug::DebugOn(); + int ret=0; int i=0; while( Images[i].sizeX>0 && Images[i].sizeY>0 ) { - ret += WriteSimple(Images[i]); + std::cout << "Test n :" << i; + ret += WriteSimple(Images[i] ); i++; }