X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=30355d3cec54d24158c4c9a57f374bf2fffaf589;hb=02e5b298070faff881e584dd818d85bfc05e92bf;hp=2c28aea8b0b35bc646472011fb9f5caff34d4fcb;hpb=0e5ad44bd2b7e3df837a518d59ad46029d6e7c0e;p=gdcm.git

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index 2c28aea8..30355d3c 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/03 11:03:41 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/08/20 09:10:24 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -137,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
@@ -166,15 +166,6 @@ int WriteSimple(Image &img)
    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 )
@@ -195,10 +186,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;
             }
@@ -208,43 +199,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"
                    << "        Write mode '"<<img.writeMode<<"' is undefined\n";
 
-         delete file;
+         delete fileH;
          delete fileToBuild;
          delete[] imageData;
          return 1;
    }
 
-   if( !file->Write(fileName.str()) )
+   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;
@@ -252,13 +243,22 @@ int WriteSimple(Image &img)
 
 // Step 5 : Read the written image
    std::cout << "5...";
-   gdcm::FileHelper *reread = new gdcm::FileHelper( fileName.str() );
+   // 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 NO_SEQ, NO_SHADOW,
+                           //              NO_SEQ|NO_SHADOW, NO_SHADOWSEQ
+   reread->Load();
+
    if( !reread->GetFile()->IsReadable() )
    {
       std::cerr << "Failed" << std::endl
                 << "Could not read written image : " << fileName << std::endl;
       delete fileToBuild;
-      delete file;
+      delete fileH;
       delete reread;
       delete[] imageData;
       return 1;
@@ -269,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() != 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() ||
@@ -283,7 +298,7 @@ int WriteSimple(Image &img)
          << "Z: " << fileToBuild->GetZSize() << " # " 
                   << reread->GetFile()->GetZSize() << std::endl;
       delete fileToBuild;
-      delete file;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -297,7 +312,7 @@ int WriteSimple(Image &img)
          << "        Pixel areas lengths differ: "
          << size << " # " << dataSizeWritten << std::endl;
       delete fileToBuild;
-      delete file;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -310,7 +325,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;
 
@@ -320,7 +335,7 @@ int WriteSimple(Image &img)
    std::cout << "OK" << std::endl;
 
    delete fileToBuild;
-   delete file;
+   delete fileH;
    delete reread;
    delete[] imageData;
 
@@ -337,13 +352,13 @@ 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;
+      std::cout << "Test n :" << i; 
       ret += WriteSimple(Images[i] );
       i++;
    }