X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=6408315567365bb4b55bd0382ec1ce1a2345b78c;hb=1f8479f468762e8cdd0f8ee1df7f9d78b6cd0838;hp=23076f16af32452a70e5fe805eac59eaf6284747;hpb=2aa990262ad42625affdb0d6866bb3afe646f965;p=gdcm.git diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 23076f16..64083155 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/25 15:29:33 $ - Version: $Revision: 1.15 $ + Date: $Date: 2005/04/19 10:05:37 $ + Version: $Revision: 1.29 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -63,63 +63,115 @@ 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'}, + + {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..."; - gdcm::File *header = new gdcm::File(); + gdcm::File *fileToBuild = new gdcm::File(); std::ostringstream str; // Set the image size str.str(""); str << img.sizeX; - header->Insert(str.str(),0x0028,0x0011); // Columns - + fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns str.str(""); str << img.sizeY; - header->Insert(str.str(),0x0028,0x0010); // Rows + fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows if(img.sizeZ>1) { str.str(""); str << img.sizeZ; - header->Insert(str.str(),0x0028,0x0008); // Number of Frames + 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; - header->Insert(str.str(),0x0028,0x0100); // Bits Allocated + fileToBuild->InsertValEntry(str.str(),0x0028,0x0100); // Bits Allocated str.str(""); str << img.componentUse; - header->Insert(str.str(),0x0028,0x0101); // Bits Stored + fileToBuild->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored str.str(""); - str << img.componentSize - 1; - header->Insert(str.str(),0x0028,0x0102); // High Bit + str << ( img.componentSize - 1 ); + fileToBuild->InsertValEntry(str.str(),0x0028,0x0102); // High Bit // Set the pixel representation str.str(""); str << img.sign; - header->Insert(str.str(),0x0028,0x0103); // Pixel Representation + 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; - header->Insert(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; } @@ -133,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;k8 ) { - *(tmp+1) = j/256; + *(tmp+1) = (unsigned char)(j/256); } - tmp += img.componentSize * img.components/8; + tmp += img.componentSize/8; } } } @@ -156,7 +208,7 @@ int WriteSimple(Image &img) // Step 3 : Create the file of the image std::cout << "3..."; - gdcm::FileHelper *file = new gdcm::FileHelper(header); + gdcm::FileHelper *file = new gdcm::FileHelper(fileToBuild); file->SetImageData(imageData,size); // Step 4 : Set the writting mode and write the image @@ -182,55 +234,70 @@ int WriteSimple(Image &img) << " Write mode '"<Write(fileName) ) + if( !file->Write(fileName.str()) ) { std::cout << "Failed\n" << "File in unwrittable\n"; delete file; - delete header; + delete fileToBuild; delete[] imageData; return 1; } // 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 - << "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 read written image : " << 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 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 (header->GetXSize() != reread->GetFile()->GetXSize() || - header->GetYSize() != reread->GetFile()->GetYSize() || - header->GetZSize() != reread->GetFile()->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() << " # " + << "X: " << fileToBuild->GetXSize() << " # " << reread->GetFile()->GetXSize() << " | " - << "Y: " << header->GetYSize() << " # " + << "Y: " << fileToBuild->GetYSize() << " # " << reread->GetFile()->GetYSize() << " | " - << "Z: " << header->GetZSize() << " # " + << "Z: " << fileToBuild->GetZSize() << " # " << reread->GetFile()->GetZSize() << std::endl; - delete header; + delete fileToBuild; delete file; delete reread; delete[] imageData; @@ -244,7 +311,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; @@ -253,12 +320,11 @@ 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 header; + delete fileToBuild; delete file; delete reread; delete[] imageData; @@ -268,7 +334,7 @@ int WriteSimple(Image &img) std::cout << "OK" << std::endl; - delete header; + delete fileToBuild; delete file; delete reread; delete[] imageData; @@ -276,7 +342,7 @@ int WriteSimple(Image &img) return 0; } -int TestWriteSimple(int argc, char* argv[]) +int TestWriteSimple(int argc, char *argv[]) { if (argc < 1) { @@ -286,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++; }