X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllReadCompareDicom.cxx;h=24e59c982b5bfcdfd23f2650757099e20a12bfc4;hb=587eff0d2fdea1b61c4cc9aa21f06f2ba8b42c10;hp=4a461f2cda64f008110a78a8ceb278bfd151e4f9;hpb=e5e7b1bd7ee84e8f9dc7da5d1d42b598fac68399;p=gdcm.git

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index 4a461f2c..24e59c98 100644
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/25 10:24:33 $
-  Version:   $Revision: 1.19 $
+  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
@@ -15,9 +15,11 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
-#include <stdio.h>
+#include "gdcmFileHelper.h"
+
+#include <iostream>
+#include <fstream>
 
 //Generated file:
 #include "gdcmDataImages.h"
@@ -29,8 +31,8 @@ int InternalTest(std::string const & filename,
 
       ////// Step 1:
       std::cout << "      1...";
-      gdcm::File* tested = new gdcm::File( filename );
-      if( !tested->GetHeader()->IsReadable() )
+      gdcm::FileHelper* tested = new gdcm::FileHelper( filename );
+      if( !tested->GetFile()->IsReadable() )
       {
         std::cout << " Failed" << std::endl
                    << "      Image not gdcm compatible:"
@@ -43,7 +45,8 @@ int InternalTest(std::string const & filename,
       ////// 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 )
       {
          uint8_t* testedImageData = tested->GetImageData(); // Kludge
@@ -54,15 +57,16 @@ int InternalTest(std::string const & filename,
       }
       else
       {
-         fclose( testFILE );
+         //fclose( testFILE );
       }
+      testFILE.close();
 
       ////// Step 3a:
       ////// When reference file is not gdcm readable test is failed:
       std::cout << "3a...";
 
-      gdcm::File* reference = new gdcm::File( referenceFileName );
-      if( !reference->GetHeader()->IsReadable() )
+      gdcm::FileHelper* reference = new gdcm::FileHelper( referenceFileName );
+      if( !reference->GetFile()->IsReadable() )
       {
          std::cout << " Failed" << std::endl
                    << "              reference image " 
@@ -73,6 +77,8 @@ int InternalTest(std::string const & filename,
          return 1;
       }
 
+      std::string PixelType = reference->GetFile()->GetPixelType();
+
       ////// Step 3b:
       std::cout << "3b...";
       int testedDataSize    = tested->GetImageDataSize();
@@ -81,10 +87,31 @@ int InternalTest(std::string const & filename,
       int    referenceDataSize = reference->GetImageDataSize();
       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 << " Failed" << std::endl
-                   << "        pixel areas lengths differ: "
+                   << "        pixel ("
+                   << PixelType
+                   <<") areas lengths differ: "
                    << testedDataSize << " # " << referenceDataSize
                    << std::endl;
          delete tested;
@@ -92,12 +119,15 @@ int InternalTest(std::string const & filename,
          return 1;
       }
 
+      // Test the data content
       if (int res = memcmp(testedImageData, referenceImageData,
                            testedDataSize) != 0 )
       {
          (void)res;
          std::cout << " Failed" << std::endl
-                   << "        pixel differ (as expanded in memory)."
+                   << "        pixel (" 
+                   << PixelType
+                   << ") differ (as expanded in memory)."
                    << std::endl;
          delete tested;
          delete reference;
@@ -140,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"