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

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index 64083155..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: 2005/04/19 10:05:37 $
-  Version:   $Revision: 1.29 $
+  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
@@ -99,6 +99,8 @@ Image Images [] = {
    {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::ostringstream fileName;
@@ -106,6 +108,7 @@ int WriteSimple(Image &img)
    fileName << "TestWriteSimple";
 
 // Step 1 : Create the header of the image
+
    std::cout << "        1...";
    gdcm::File *fileToBuild = new gdcm::File();
    std::ostringstream str;
@@ -113,16 +116,16 @@ int WriteSimple(Image &img)
    // Set the image size
    str.str("");
    str << img.sizeX;
-   fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0011); // Columns
    str.str("");
    str << img.sizeY;
-   fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0010); // Rows
 
    if(img.sizeZ>1)
    {
       str.str("");
       str << img.sizeZ;
-      fileToBuild->InsertValEntry(str.str(),0x0028,0x0008); // Number of Frames
+      fileToBuild->InsertEntryString(str.str(),0x0028,0x0008); // Number of Frames
    }
 
    fileName << "-" << img.sizeX << "-" << img.sizeY << "-" << img.sizeZ;
@@ -130,20 +133,20 @@ int WriteSimple(Image &img)
    // Set the pixel type
    str.str("");
    str << img.componentSize;
-   fileToBuild->InsertValEntry(str.str(),0x0028,0x0100); // Bits Allocated
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0100); // Bits Allocated
 
    str.str("");
    str << img.componentUse;
-   fileToBuild->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0101); // Bits Stored
 
    str.str("");
    str << ( img.componentSize - 1 );
-   fileToBuild->InsertValEntry(str.str(),0x0028,0x0102); // High Bit
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0102); // High Bit
 
    // Set the pixel representation
    str.str("");
    str << img.sign;
-   fileToBuild->InsertValEntry(str.str(),0x0028,0x0103); // Pixel Representation
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0103); // Pixel Representation
 
    fileName << "-" << img.componentSize;
    if(img.sign == 0)
@@ -154,26 +157,19 @@ int WriteSimple(Image &img)
    switch (img.writeMode)
    {
       case 'a' :
-         fileName << ".ACR"; break; 
+         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;
-   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;
-   }
+   fileToBuild->InsertEntryString(str.str(),0x0028,0x0002); // Samples per Pixel
 
 // Step 2 : Create the output image
    std::cout << "2...";
@@ -208,43 +204,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"
+         std::cout << "Failed for [" << fileName.str() << "]\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";
+      std::cout << "Failed for [" << fileName.str() << "]\n"
+                << "           File is unwrittable\n";
 
-      delete file;
+      delete fileH;
       delete fileToBuild;
       delete[] imageData;
       return 1;
@@ -252,13 +248,26 @@ 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 
+                           //              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 read written image : " << fileName << std::endl;
+                << "Could not read written image : " << fileName.str() << std::endl;
       delete fileToBuild;
-      delete file;
+      delete fileH;
       delete reread;
       delete[] imageData;
       return 1;
@@ -270,14 +279,14 @@ int WriteSimple(Image &img)
    uint8_t *imageDataWritten = reread->GetImageData();
 
    // Test the image write mode
-   if (reread->GetFile()->GetFileType() != file->GetWriteType())
+   if (reread->GetFile()->GetFileType() != fileH->GetWriteType())
    {
       std::cout << "Failed" << std::endl
          << "        File type differ: "
-         << file->GetWriteType() << " # " 
+         << fileH->GetWriteType() << " # " 
          << reread->GetFile()->GetFileType() << std::endl;
       delete fileToBuild;
-      delete file;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -289,7 +298,7 @@ int WriteSimple(Image &img)
        fileToBuild->GetYSize() != reread->GetFile()->GetYSize() ||
        fileToBuild->GetZSize() != reread->GetFile()->GetZSize())
    {
-      std::cout << "Failed" << std::endl
+      std::cout << "Failed for [" << fileName.str() << "]" << std::endl
          << "        X Size differs: "
          << "X: " << fileToBuild->GetXSize() << " # " 
                   << reread->GetFile()->GetXSize() << " | "
@@ -298,7 +307,7 @@ int WriteSimple(Image &img)
          << "Z: " << fileToBuild->GetZSize() << " # " 
                   << reread->GetFile()->GetZSize() << std::endl;
       delete fileToBuild;
-      delete file;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -312,7 +321,7 @@ int WriteSimple(Image &img)
          << "        Pixel areas lengths differ: "
          << size << " # " << dataSizeWritten << std::endl;
       delete fileToBuild;
-      delete file;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -324,8 +333,25 @@ int WriteSimple(Image &img)
    {
       std::cout << "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) :" 
+                  << 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 file;
+      delete fileH;
       delete reread;
       delete[] imageData;
 
@@ -335,7 +361,7 @@ int WriteSimple(Image &img)
    std::cout << "OK" << std::endl;
 
    delete fileToBuild;
-   delete file;
+   delete fileH;
    delete reread;
    delete[] imageData;
 
@@ -352,7 +378,7 @@ int TestWriteSimple(int argc, char *argv[])
       return 1;
    }
 
-   gdcm::Debug::DebugOn();
+   //gdcm::Debug::DebugOn();
        
    int ret=0;
    int i=0;