Program: gdcm
Module: $RCSfile: TestWriteSimple.cxx,v $
Language: C++
- Date: $Date: 2005/02/07 19:17:27 $
- Version: $Revision: 1.22 $
+ Date: $Date: 2005/08/30 15:13:07 $
+ Version: $Revision: 1.36 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{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...";
str.str("");
str << img.sizeX;
fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns
-
str.str("");
str << img.sizeY;
fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows
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
str.str("");
- str << img.componentSize - 1;
+ str << ( img.componentSize - 1 );
fileToBuild->InsertValEntry(str.str(),0x0028,0x0102); // High Bit
// Set the pixel representation
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;
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 )
{
for(int c=0;c<img.components;c++)
{
- *tmp = j%256;
+ *tmp = (unsigned char)(j%256);
if( img.componentSize>8 )
{
- *(tmp+1) = j/256;
+ *(tmp+1) = (unsigned char)(j/256);
}
- tmp += img.components/8;
+ tmp += img.componentSize/8;
}
}
}
// 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"
<< " Write mode '"<<img.writeMode<<"' is undefined\n";
- delete file;
+ delete fileH;
delete fileToBuild;
delete[] imageData;
return 1;
}
- if( !file->Write(fileName) )
+ if( !fileH->Write(fileName.str()) )
{
std::cout << "Failed\n"
- << "File in unwrittable\n";
+ << " File in unwrittable\n";
- delete file;
+ delete fileH;
delete fileToBuild;
delete[] imageData;
return 1;
// 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 << std::endl;
delete fileToBuild;
- delete file;
+ delete fileH;
delete reread;
delete[] imageData;
return 1;
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() ||
<< "Z: " << fileToBuild->GetZSize() << " # "
<< reread->GetFile()->GetZSize() << std::endl;
delete fileToBuild;
- delete file;
+ delete fileH;
delete reread;
delete[] imageData;
<< " Pixel areas lengths differ: "
<< size << " # " << dataSizeWritten << std::endl;
delete fileToBuild;
- delete file;
+ delete fileH;
delete reread;
delete[] imageData;
}
// 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;
- delete file;
+ delete fileH;
delete reread;
delete[] imageData;
std::cout << "OK" << std::endl;
delete fileToBuild;
- delete file;
+ delete fileH;
delete reread;
delete[] imageData;
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++;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff