X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=f3172b1a2e493c51d6db34945e743de4867fed85;hb=01940747ce53f8c87bc883c47fd152e787e73b07;hp=19b216bc1e901c5a116bcfcd7584bb821cda2da5;hpb=a9f954f2b63d67c79b206acec6493c3395030147;p=gdcm.git diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 19b216bc..f3172b1a 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/10 14:23:18 $ - Version: $Revision: 1.25 $ + Date: $Date: 2005/09/06 11:16:04 $ + Version: $Revision: 1.37 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -101,9 +101,12 @@ Image Images [] = { 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 *fileToBuild = new gdcm::File(); std::ostringstream str; @@ -112,7 +115,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 @@ -124,6 +126,8 @@ 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; @@ -134,7 +138,7 @@ int WriteSimple(Image &img) fileToBuild->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored str.str(""); - str << img.componentSize - 1; + str << ( img.componentSize - 1 ); fileToBuild->InsertValEntry(str.str(),0x0028,0x0102); // High Bit // Set the pixel representation @@ -142,20 +146,29 @@ 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; + } + + std::cout << "[" << fileName.str() << "]..."; + // Set the samples per pixel str.str(""); str << img.components; fileToBuild->InsertValEntry(str.str(),0x0028,0x0002); // Samples per Pixel - if( !fileToBuild->IsReadable() ) - { - std::cout << "Failed\n" - << " Prepared image isn't readable\n"; - - delete fileToBuild; - return 1; - } - // Step 2 : Create the output image std::cout << "2..."; if( img.componentSize%8 > 0 ) @@ -176,10 +189,10 @@ int WriteSimple(Image &img) { for(int c=0;c8 ) { - *(tmp+1) = j/256; + *(tmp+1) = (unsigned char)(j/256); } tmp += img.componentSize/8; } @@ -189,43 +202,43 @@ int WriteSimple(Image &img) // Step 3 : Create the file of the image std::cout << "3..."; - gdcm::FileHelper *file = new gdcm::FileHelper(fileToBuild); - file->SetImageData(imageData,size); + gdcm::FileHelper *fileH = new gdcm::FileHelper(fileToBuild); + fileH->SetImageData(imageData,size); // Step 4 : Set the writting mode and write the image std::cout << "4..."; - file->SetWriteModeToRaw(); + fileH->SetWriteModeToRaw(); switch (img.writeMode) { case 'a' : // Write an ACR file - file->SetWriteTypeToAcr(); + fileH->SetWriteTypeToAcr(); break; case 'e' : // Write a DICOM Explicit VR file - file->SetWriteTypeToDcmExplVR(); + fileH->SetWriteTypeToDcmExplVR(); break; case 'i' : // Write a DICOM Implicit VR file - file->SetWriteTypeToDcmImplVR(); + fileH->SetWriteTypeToDcmImplVR(); break; default : - std::cout << "Failed\n" + std::cout << "Failed for [" << fileName.str() << "]\n" << " Write mode '"<Write(fileName) ) + if( !fileH->Write(fileName.str()) ) { - std::cout << "Failed\n" - << "File in unwrittable\n"; + std::cout << "Failed for [" << fileName.str() << "]\n" + << " File in unwrittable\n"; - delete file; + delete fileH; delete fileToBuild; delete[] imageData; return 1; @@ -233,13 +246,26 @@ int WriteSimple(Image &img) // Step 5 : Read the written image std::cout << "5..."; - gdcm::FileHelper *reread = new gdcm::FileHelper( fileName ); + // old form. + //gdcm::FileHelper *reread = new gdcm::FileHelper( fileName.str() ); + // Better use : + gdcm::FileHelper *reread = new gdcm::FileHelper( ); + reread->SetFileName( fileName.str() ); + reread->SetLoadMode(0); // Load everything + // Other possible values are + // gdcm::LD_ALL, + // gdcm::LD_NOSEQ, + // gdcm::LD_NOSHADOW, + // gdcm::LD_NOSEQ|gdcm::LD_NOSHADOW, + // gdcm::LD_NOSHADOWSEQ + reread->Load(); + if( !reread->GetFile()->IsReadable() ) { std::cerr << "Failed" << std::endl - << "Could not reread image written: " << fileName << std::endl; + << "Could not read written image : " << fileName.str() << std::endl; delete fileToBuild; - delete file; + delete fileH; delete reread; delete[] imageData; return 1; @@ -250,12 +276,27 @@ int WriteSimple(Image &img) size_t dataSizeWritten = reread->GetImageDataSize(); uint8_t *imageDataWritten = reread->GetImageData(); + // Test the image write mode + if (reread->GetFile()->GetFileType() != fileH->GetWriteType()) + { + std::cout << "Failed" << std::endl + << " File type differ: " + << fileH->GetWriteType() << " # " + << reread->GetFile()->GetFileType() << std::endl; + delete fileToBuild; + delete fileH; + delete reread; + delete[] imageData; + + return 1; + } + // Test the image size if (fileToBuild->GetXSize() != reread->GetFile()->GetXSize() || fileToBuild->GetYSize() != reread->GetFile()->GetYSize() || fileToBuild->GetZSize() != reread->GetFile()->GetZSize()) { - std::cout << "Failed" << std::endl + std::cout << "Failed for [" << fileName.str() << "]" << std::endl << " X Size differs: " << "X: " << fileToBuild->GetXSize() << " # " << reread->GetFile()->GetXSize() << " | " @@ -264,7 +305,7 @@ int WriteSimple(Image &img) << "Z: " << fileToBuild->GetZSize() << " # " << reread->GetFile()->GetZSize() << std::endl; delete fileToBuild; - delete file; + delete fileH; delete reread; delete[] imageData; @@ -278,7 +319,7 @@ int WriteSimple(Image &img) << " Pixel areas lengths differ: " << size << " # " << dataSizeWritten << std::endl; delete fileToBuild; - delete file; + delete fileH; delete reread; delete[] imageData; @@ -291,7 +332,7 @@ int WriteSimple(Image &img) std::cout << "Failed" << std::endl << " Pixel differ (as expanded in memory)." << std::endl; delete fileToBuild; - delete file; + delete fileH; delete reread; delete[] imageData; @@ -301,7 +342,7 @@ int WriteSimple(Image &img) std::cout << "OK" << std::endl; delete fileToBuild; - delete file; + delete fileH; delete reread; delete[] imageData; @@ -318,11 +359,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++; }