X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=45a1769bba9a2e6a6fbdd619d5778dfc8481ac33;hb=eacd2efd90ffb9015d6358f135cb17a838a29abb;hp=de449f580a9b60aa4b7a41de1979b140ed5a3655;hpb=56007539cb53ddd67be25af4d68e730188ac6b36;p=gdcm.git

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index de449f58..45a1769b 100644
--- a/Testing/TestWriteSimple.cxx
+++ b/Testing/TestWriteSimple.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWriteSimple.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/10 15:46:15 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/10/20 08:58:15 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,10 +22,12 @@
  * The image content is a horizontal grayscale from 
  * 
  */
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
+#include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
+#include <sstream>
 
 typedef struct
 {
@@ -61,65 +63,113 @@ Image Images [] = {
    {256, 512, 1, 1, 16, 16, 0, 'a'},
    {256, 512, 1, 1, 16, 16, 0, 'e'},
    {256, 512, 1, 1, 16, 16, 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
 };
 
+const unsigned int MAX_NUMBER_OF_DIFFERENCE = 10;
+
 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::Header *header = new gdcm::Header();
+   gdcm::File *fileToBuild = new gdcm::File();
    std::ostringstream str;
 
    // Set the image size
    str.str("");
    str << img.sizeX;
-   header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0011); // Columns
-
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0011); // Columns
    str.str("");
    str << img.sizeY;
-   header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0010); // Rows
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0010); // Rows
 
    if(img.sizeZ>1)
    {
       str.str("");
       str << img.sizeZ;
-      header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0008); // Number of Frames
+      fileToBuild->InsertEntryString(str.str(),0x0028,0x0008); // Number of Frames
    }
 
+   fileName << "-" << img.sizeX << "-" << img.sizeY << "-" << img.sizeZ;
+
    // Set the pixel type
    str.str("");
    str << img.componentSize;
-   header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0100); // Bits Allocated
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0100); // Bits Allocated
 
    str.str("");
    str << img.componentUse;
-   header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0101); // Bits Stored
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0101); // Bits Stored
 
    str.str("");
-   str << img.componentSize - 1;
-   header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0102); // High Bit
+   str << ( img.componentSize - 1 );
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0102); // High Bit
 
    // Set the pixel representation
    str.str("");
    str << img.sign;
-   header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0103); // Pixel Representation
+   fileToBuild->InsertEntryString(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;
-   header->ReplaceOrCreateByNumber(str.str(),0x0028,0x0002); // Samples per Pixel
-
-   if( !header->IsReadable() )
-   {
-      std::cout << "Failed\n"
-                << "        Prepared image isn't readable\n";
-
-      delete header;
-      return 1;
-   }
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0002); // Samples per Pixel
 
 // Step 2 : Create the output image
    std::cout << "2...";
@@ -131,7 +181,7 @@ int WriteSimple(Image &img)
                * img.components * img.componentSize / 8;
    unsigned char *imageData = new unsigned char[size];
 
-   // FIXME : find a best heuristic to create the image
+   // FIXME : find a better heuristic to create the image
    unsigned char *tmp = imageData;
    for(int k=0;k<img.sizeZ;k++)
    {
@@ -141,12 +191,12 @@ 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 * img.components/8;
+               tmp += img.componentSize/8;
             }
          }
       }
@@ -154,82 +204,110 @@ int WriteSimple(Image &img)
 
 // Step 3 : Create the file of the image
    std::cout << "3...";
-   gdcm::File *file = new gdcm::File(header);
-   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 '"<<img.writeMode<<"' is undefined\n";
 
-         delete file;
-         delete header;
+         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";
+      std::cout << "Failed for [" << fileName.str() << "]\n"
+                << "           File is unwrittable\n";
 
-      delete file;
-      delete header;
+      delete fileH;
+      delete fileToBuild;
       delete[] imageData;
       return 1;
    }
 
 // Step 5 : Read the written image
    std::cout << "5...";
-   gdcm::File* reread = new gdcm::File( fileName );
-   if( !reread->GetHeader()->IsReadable() )
+   // 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
-               << "Test::TestReadWriteReadCompare: Could not reread image "
-               << "written:" << fileName << std::endl;
-     delete header;
-     delete file;
-     delete reread;
-     return 1;
+      std::cerr << "Failed" << std::endl
+                << "Could not read written image : " << fileName.str() << std::endl;
+      delete fileToBuild;
+      delete fileH;
+      delete reread;
+      delete[] imageData;
+      return 1;
    }
 
 // Step 6 : Compare to the written image
    std::cout << "6...";
-   int    dataSizeWritten = reread->GetImageDataSize();
-   uint8_t* imageDataWritten = reread->GetImageData();
+   size_t dataSizeWritten = reread->GetImageDataSize();
+   uint8_t *imageDataWritten = reread->GetImageData();
 
-   // Test the image size
-   if (header->GetXSize() != reread->GetHeader()->GetXSize() ||
-       header->GetYSize() != reread->GetHeader()->GetYSize() ||
-       header->GetZSize() != reread->GetHeader()->GetZSize())
+   // 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 for [" << fileName.str() << "]" << std::endl
          << "        X Size differs: "
-         << "X: " << header->GetXSize() << " # " 
-                  << reread->GetHeader()->GetXSize() << " | "
-         << "Y: " << header->GetYSize() << " # " 
-                  << reread->GetHeader()->GetYSize() << " | "
-         << "Z: " << header->GetZSize() << " # " 
-                  << reread->GetHeader()->GetZSize() << std::endl;
-      delete header;
-      delete file;
+         << "X: " << fileToBuild->GetXSize() << " # " 
+                  << reread->GetFile()->GetXSize() << " | "
+         << "Y: " << fileToBuild->GetYSize() << " # " 
+                  << reread->GetFile()->GetYSize() << " | "
+         << "Z: " << fileToBuild->GetZSize() << " # " 
+                  << reread->GetFile()->GetZSize() << std::endl;
+      delete fileToBuild;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -242,8 +320,8 @@ int WriteSimple(Image &img)
       std::cout << "Failed" << std::endl
          << "        Pixel areas lengths differ: "
          << size << " # " << dataSizeWritten << std::endl;
-      delete header;
-      delete file;
+      delete fileToBuild;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -251,13 +329,29 @@ int WriteSimple(Image &img)
    }
 
    // 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 header;
-      delete file;
+      std::cout << "        list of the first " << MAX_NUMBER_OF_DIFFERENCE
+                  << " pixels differing (pos : test - ref) :" 
+                  << std::endl;
+      unsigned int i;
+      unsigned int j;
+      for(i=0, j=0;i<dataSizeWritten && j<MAX_NUMBER_OF_DIFFERENCE;i++)
+      {
+         if(imageDataWritten[i]!=imageData[i])
+            {
+            std::cout << std::hex << "(" << i << " : " 
+                        << std::hex << (int)(imageDataWritten[i]) << " - "
+                        << std::hex << (int)(imageData[i]) << ") "
+                        << std::dec;
+            ++j;
+            }
+      }
+      std::cout << std::endl;
+      delete fileToBuild;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -266,15 +360,15 @@ int WriteSimple(Image &img)
 
    std::cout << "OK" << std::endl;
 
-   delete header;
-   delete file;
+   delete fileToBuild;
+   delete fileH;
    delete reread;
    delete[] imageData;
 
    return 0;
 }
 
-int TestWriteSimple(int argc, char* argv[])
+int TestWriteSimple(int argc, char *argv[])
 {
    if (argc < 1) 
    {
@@ -284,11 +378,14 @@ int TestWriteSimple(int argc, char* argv[])
       return 1;
    }
 
-   int ret;
+   //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++;
    }