X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=5e981eee707f219dd9ec66348f38f53f765bcfd4;hb=4552d4ee18f3234af4e037e77abf0622c2702004;hp=b955cde0b36156c0d61443172714f69388ab72ea;hpb=9077bb6ff1cc18470cdb173327773c9130ba5f70;p=gdcm.git diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index b955cde0..5e981eee 100644 --- a/Testing/TestWriteSimple.cxx +++ b/Testing/TestWriteSimple.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestWriteSimple.cxx,v $ Language: C++ - Date: $Date: 2006/04/07 14:15:56 $ - Version: $Revision: 1.48 $ + Date: $Date: 2007/09/28 14:20:22 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -37,8 +37,8 @@ typedef struct int sizeY; // Size Y of the image int sizeZ; // Size Z of the image int components; // Number of components for a pixel - int componentSize; // Component size (in bits : 8, 16) - int componentUse ; // Component size (in bits) + int componentSize; // Component size (in bits : 8, 16) // Bits Allocated + int componentUse ; // Component size (in bits) // Bits Stored int sign; // Sign of components char writeMode; // Write mode // - 'a' : ACR @@ -47,6 +47,20 @@ typedef struct } Image; Image Images [] = { +// these ones are use to check further oddities. + + {63, 127, 1, 1, 16, 8, 0 ,'e'}, + {63, 127, 1, 1, 16, 9, 0 ,'e'}, + {63, 127, 1, 1, 16, 10, 0 ,'e'}, + {63, 127, 1, 1, 16, 11, 0 ,'e'}, + {63, 127, 1, 1, 16, 12, 0 ,'e'}, + {63, 127, 1, 1, 16, 13, 0 ,'e'}, + {63, 127, 1, 1, 16, 14, 0 ,'e'}, + {63, 127, 1, 1, 16, 15, 0 ,'e'}, + {63, 127, 1, 1, 16, 16, 0 ,'e'}, + + {63, 127, 1, 1, 32, 32, 0 ,'e'}, // Pixel VR should be OL? + {128, 128, 1, 1, 8, 8, 0, 'e'}, {256, 128, 1, 1, 8, 8, 0, 'a'}, {128, 128, 1, 1, 8, 8, 0, 'i'}, @@ -118,25 +132,25 @@ int WriteSimple(Image &img) // Step 1 : Create an empty FileHelper std::cout << " 1..."; - gdcm::FileHelper *fileH = gdcm::FileHelper::New(); + GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New(); // Get the (empty) image header. - gdcm::File *fileToBuild = fileH->GetFile(); + GDCM_NAME_SPACE::File *fileToBuild = fileH->GetFile(); std::ostringstream str; // Set the image size str.str(""); str << img.sizeX; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0011); // Columns + fileToBuild->InsertEntryString(str.str(),0x0028,0x0011,"US"); // Columns str.str(""); str << img.sizeY; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0010); // Rows + fileToBuild->InsertEntryString(str.str(),0x0028,0x0010,"US"); // Rows if(img.sizeZ>1) { str.str(""); str << img.sizeZ; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0008); // Number of Frames + fileToBuild->InsertEntryString(str.str(),0x0028,0x0008, "IS"); // Number of Frames } fileName << "-" << img.sizeX << "-" << img.sizeY << "-" << img.sizeZ; @@ -144,42 +158,62 @@ int WriteSimple(Image &img) // Set the pixel type str.str(""); str << img.componentSize; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0100); // Bits Allocated + fileToBuild->InsertEntryString(str.str(),0x0028,0x0100,"US"); // Bits Allocated str.str(""); str << img.componentUse; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0101); // Bits Stored + fileToBuild->InsertEntryString(str.str(),0x0028,0x0101,"US"); // Bits Stored str.str(""); - str << ( img.componentSize - 1 ); - fileToBuild->InsertEntryString(str.str(),0x0028,0x0102); // High Bit + str << ( img.componentUse - 1 ); + fileToBuild->InsertEntryString(str.str(),0x0028,0x0102,"US"); // High Bit // Set the pixel representation str.str(""); str << img.sign; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0103); // Pixel Representation + fileToBuild->InsertEntryString(str.str(),0x0028,0x0103,"US"); // Pixel Representation fileName << "-" << img.componentSize; if(img.sign == 0) fileName << "U"; else fileName << "S"; - + + fileName << "-" << img.componentSize << "-" << img.componentUse; + + fileToBuild->InsertEntryString("0",0x0008,0x0000,"UL"); // Should be removed + // except for ACR switch (img.writeMode) { case 'a' : - fileName << ".ACR"; break; + fileName << ".ACR"; + break; case 'e' : - fileName << ".EXPL"; break; + fileName << ".EXPL"; + break; case 'i' : - fileName << ".IMPL"; break; + fileName << ".IMPL"; + break; } + if(img.componentSize == 32) + { + // Create a Private DataElement; VR =OL + fileToBuild->InsertEntryString("gdcm test OL",0x0009,0x0010,"LO"); + uint32_t binArea[4]; + binArea[0] = 0x01234567; + binArea[1] = 0x89abcdef; + binArea[2] = 0x2468ace0; + binArea[2] = 0xfdb97531; + fileToBuild->InsertEntryBinArea((uint8_t *)binArea,16,0x0009,0x0100,"OL"); + } + + std::cout << "[" << fileName.str() << "]..."; // Set the samples per pixel str.str(""); str << img.components; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0002); // Samples per Pixel + fileToBuild->InsertEntryString(str.str(),0x0028,0x0002,"US"); // Samples per Pixel // Step 2 : Create the output image std::cout << "2..."; @@ -244,7 +278,7 @@ int WriteSimple(Image &img) } std::cout << std::endl; - fileToBuild->Print(); + //fileToBuild->Print(); if( !fileH->Write(fileName.str()) ) { @@ -260,26 +294,26 @@ int WriteSimple(Image &img) // Step 5 : Read the written image std::cout << "5..." << std::endl; // old form. - //gdcm::FileHelper *reread = new gdcm::FileHelper( fileName.str() ); + //GDCM_NAME_SPACE::FileHelper *reread = new GDCM_NAME_SPACE::FileHelper( fileName.str() ); // Better use : - gdcm::File *f = gdcm::File::New( ); - f->SetLoadMode(gdcm::LD_ALL); + GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New( ); + f->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); f->SetFileName( fileName.str() ); //reread->SetFileName( fileName.str() ); - //reread->SetLoadMode(gdcm::LD_ALL); // Load everything + //reread->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); // Load everything // Possible values are - // gdcm::LD_ALL, - // gdcm::LD_NOSEQ, - // gdcm::LD_NOSHADOW, - // gdcm::LD_NOSEQ|gdcm::LD_NOSHADOW, - // gdcm::LD_NOSHADOWSEQ + // GDCM_NAME_SPACE::LD_ALL, + // GDCM_NAME_SPACE::LD_NOSEQ, + // GDCM_NAME_SPACE::LD_NOSHADOW, + // GDCM_NAME_SPACE::LD_NOSEQ|GDCM_NAME_SPACE::LD_NOSHADOW, + // GDCM_NAME_SPACE::LD_NOSHADOWSEQ f->Load(); // reread->Load(); - gdcm::FileHelper *reread = gdcm::FileHelper::New( f ); + GDCM_NAME_SPACE::FileHelper *reread = GDCM_NAME_SPACE::FileHelper::New( f ); - reread->Print(); + //reread->Print(); if( !reread->GetFile()->IsReadable() ) { @@ -311,7 +345,7 @@ int WriteSimple(Image &img) return 1; } - + std::cout << "6.1..." << std::endl; // Test the image size if (fileToBuild->GetXSize() != reread->GetFile()->GetXSize() || fileToBuild->GetYSize() != reread->GetFile()->GetYSize() || @@ -332,7 +366,7 @@ int WriteSimple(Image &img) return 1; } - + std::cout << "6.2..." << std::endl; // Test the data size if (size != dataSizeWritten) { @@ -346,11 +380,11 @@ int WriteSimple(Image &img) return 1; } - +std::cout << "6.3..." << std::endl; // Test the data content if ( memcmp(imageData, imageDataWritten, size) !=0 ) { - std::cout << "Failed" << std::endl + std::cout << fileName.str() << " Failed " << std::endl << " Pixel differ (as expanded in memory)." << std::endl; std::cout << " list of the first " << MAX_NUMBER_OF_DIFFERENCE << " pixels differing (pos : test - ref) :" @@ -376,7 +410,7 @@ int WriteSimple(Image &img) return 1; } - +std::cout << "======================= OK" << std::endl; fileH->Delete(); reread->Delete(); delete[] imageData; @@ -393,7 +427,7 @@ int TestWriteSimple(int argc, char *argv[]) return 1; } - // gdcm::Debug::DebugOn(); + // GDCM_NAME_SPACE::Debug::DebugOn(); int ret=0; int i=0;