X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllReadCompareDicom.cxx;h=24e59c982b5bfcdfd23f2650757099e20a12bfc4;hb=0a9f25290006bdee6be492179f8b0dae7ba1c598;hp=a4690f19df2c36bbe72a803f303bf56ed545141d;hpb=05f4ffeadc3beb5ff48fd88e7342d9287c18a27b;p=gdcm.git

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index a4690f19..24e59c98 100644
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -1,6 +1,25 @@
-#include "gdcmHeader.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/21 11:40:53 $
+  Version:   $Revision: 1.25 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 #include "gdcmFile.h"
-#include <stdio.h>
+#include "gdcmFileHelper.h"
+
+#include <iostream>
+#include <fstream>
 
 //Generated file:
 #include "gdcmDataImages.h"
@@ -10,92 +29,116 @@ int InternalTest(std::string const & filename,
 {
       std::cout << "   Testing: " << filename << std::endl;
 
-      gdcm::File* tested = new gdcm::File( filename );
-      if( !tested->GetHeader()->IsReadable() )
+      ////// Step 1:
+      std::cout << "      1...";
+      gdcm::FileHelper* tested = new gdcm::FileHelper( filename );
+      if( !tested->GetFile()->IsReadable() )
       {
-        std::cout << "      Image not gdcm compatible:"
+        std::cout << " Failed" << std::endl
+                   << "      Image not gdcm compatible:"
                   << filename << std::endl;
         delete tested;
         return 1;
       }
 
       ////// Step 2:
-
       ////// Check for existence of reference baseline dicom file:
+      std::cout << "2...";
 
-      FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+      //FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+      std::ifstream testFILE( referenceFileName.c_str() );
       if (! testFILE )
       {
-      ////// Step 3a:
+         uint8_t* testedImageData = tested->GetImageData(); // Kludge
+         (void)testedImageData;
 
-         int testedDataSize    = tested->GetImageDataSize();
-         (void)testedDataSize;
-         void* testedImageData = tested->GetImageData(); // Kludge
+         tested->SetWriteModeToRGB();
          tested->WriteDcmExplVR( referenceFileName );
-         std::cerr << "      Creating reference baseline file :" << std::endl
-                   << "      " << referenceFileName 
-                   << std::endl;
-         delete tested;
-         delete (char*)testedImageData;
-         return 0;
       }
       else
       {
-         fclose( testFILE );
+         //fclose( testFILE );
       }
+      testFILE.close();
 
+      ////// Step 3a:
       ////// When reference file is not gdcm readable test is failed:
-  
-      gdcm::File* reference = new gdcm::File( referenceFileName );
-      if( !reference->GetHeader()->IsReadable() )
+      std::cout << "3a...";
+
+      gdcm::FileHelper* reference = new gdcm::FileHelper( referenceFileName );
+      if( !reference->GetFile()->IsReadable() )
       {
-         std::cout << "      Reference image " << std::endl
-                   << "      " << referenceFileName <<std::endl
-                   << "      is not gdcm compatible." << std::endl;
+         std::cout << " Failed" << std::endl
+                   << "              reference image " 
+                   << referenceFileName 
+                   << " is not gdcm compatible." << std::endl;
          delete tested;
          delete reference;
          return 1;
       }
 
-      ////// Step 3b:
+      std::string PixelType = reference->GetFile()->GetPixelType();
 
+      ////// Step 3b:
+      std::cout << "3b...";
       int testedDataSize    = tested->GetImageDataSize();
-      void* testedImageData = tested->GetImageData();
+      uint8_t* testedImageData = tested->GetImageData();
     
       int    referenceDataSize = reference->GetImageDataSize();
-      void* referenceImageData = reference->GetImageData();
+      uint8_t* referenceImageData = reference->GetImageData();
+
+      // Test the image size
+      if (tested->GetFile()->GetXSize() != reference->GetFile()->GetXSize() ||
+          tested->GetFile()->GetYSize() != reference->GetFile()->GetYSize() ||
+          tested->GetFile()->GetZSize() != reference->GetFile()->GetZSize())
+      {
+         std::cout << "Failed" << std::endl
+            << "        Size differs: "
+            << "X: " << tested->GetFile()->GetXSize() << " # " 
+                     << reference->GetFile()->GetXSize() << " | "
+            << "Y: " << tested->GetFile()->GetYSize() << " # " 
+                     << reference->GetFile()->GetYSize() << " | "
+            << "Z: " << tested->GetFile()->GetZSize() << " # " 
+                     << reference->GetFile()->GetZSize() << std::endl;
+         delete reference;
+         delete tested;
+         return 1;
+      }
 
+      // Test the data size
       if (testedDataSize != referenceDataSize)
       {
-         std::cout << "        Pixel areas lengths differ: "
+         std::cout << " Failed" << std::endl
+                   << "        pixel ("
+                   << PixelType
+                   <<") areas lengths differ: "
                    << testedDataSize << " # " << referenceDataSize
                    << std::endl;
          delete tested;
          delete reference;
-         delete (char*)testedImageData;
-         delete (char*)referenceImageData;
          return 1;
       }
 
+      // Test the data content
       if (int res = memcmp(testedImageData, referenceImageData,
                            testedDataSize) != 0 )
       {
          (void)res;
-         std::cout << "        Pixel differ (as expanded in memory)."
+         std::cout << " Failed" << std::endl
+                   << "        pixel (" 
+                   << PixelType
+                   << ") differ (as expanded in memory)."
                    << std::endl;
          delete tested;
          delete reference;
-         delete (char*)testedImageData;
-         delete (char*)referenceImageData;
          return 1;
       }
-      std::cout << "      Passed." << std::endl ;
 
       //////////////// Clean up:
       delete tested;
       delete reference;
-      delete (char*)testedImageData;
-      delete (char*)referenceImageData;
+
+      std::cout << "OK." << std::endl;
       
       return 0;
 }
@@ -127,7 +170,7 @@ int TestAllReadCompareDicom(int argc, char* argv[])
              << std::endl;
    std::cout << "   apply the following to each filename.xxx: "
              << std::endl;
-   std::cout << "   step 1: parse the image (as gdcmHeader) and call"
+   std::cout << "   step 1: parse the image (as gdcmFile) and call"
              << " IsReadable(). "
              << std::endl;
    std::cout << "   step 2: find in GDCM_DATA_ROOT/BaselineDicom/filename.dcm"
@@ -173,23 +216,7 @@ int TestAllReadCompareDicom(int argc, char* argv[])
          testDIR->close();
       }
 
-/*      FILE* testFILE = fopen( baseLineDir.c_str(), "r" );
-      if (!testFILE )
-      {
-         std::cerr << "   The reference baseline directory " << std::endl
-                   << "      "
-                   << baseLineDir << std::endl
-                   << "   couldn't be opened."
-                   << std::endl;
-         return 1;
-      }
-      else
-      {
-         fclose( testFILE );
-      }*/
-
       ////// Step 1 (see above description):
-
       std::string filename = GDCM_DATA_ROOT;
       filename += "/";
       filename += gdcmDataImages[i];