X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=6408315567365bb4b55bd0382ec1ce1a2345b78c;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=d0364ea10f116f38f38c33a2acf685090cd19710;hpb=af53562fa5426146d01a30244cc4a7df9d6927b0;p=gdcm.git

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index d0364ea1..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/03/02 16:39:28 $
-  Version:   $Revision: 1.26 $
+  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
@@ -101,7 +101,9 @@ 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...";
@@ -112,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
@@ -124,6 +125,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 +137,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,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;
@@ -176,10 +195,10 @@ int WriteSimple(Image &img)
          {
             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.componentSize/8;
             }
@@ -220,7 +239,7 @@ int WriteSimple(Image &img)
          return 1;
    }
 
-   if( !file->Write(fileName) )
+   if( !file->Write(fileName.str()) )
    {
       std::cout << "Failed\n"
                 << "File in unwrittable\n";
@@ -233,7 +252,7 @@ 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
@@ -250,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() ||
@@ -318,14 +352,14 @@ int TestWriteSimple(int argc, char *argv[])
       return 1;
    }
 
-  // gdcm::Debug::DebugOn();    
- 
+   gdcm::Debug::DebugOn();
+       
    int ret=0;
    int i=0;
    while( Images[i].sizeX>0 && Images[i].sizeY>0 )
    {
-      std::cout << std::endl << "Test n :" << i << std::endl;
-      ret += WriteSimple(Images[i]);
+      std::cout << "Test n :" << i; 
+      ret += WriteSimple(Images[i] );
       i++;
    }