X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllReadCompareDicom.cxx;h=53afc93357638381ad9a636c14e2099b4f86488b;hb=dbf0c4289e6f0ff02f9db534899435005fa50cc2;hp=23563114b754b500921f210be3d6f65b8bc96472;hpb=b4039f93d1d97f94387402320a8786a3209938bc;p=gdcm.git

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index 23563114..53afc933 100644
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/05/02 17:56:44 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2005/10/25 14:52:30 $
+  Version:   $Revision: 1.49 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,7 @@
 #include "gdcmFileHelper.h"
 #include "gdcmGlobal.h"
 #include "gdcmTS.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
 
@@ -395,16 +396,23 @@ int InternalTest(std::string const &filename,
 
       ////// Step 1:
       std::cout << "1...";
-      gdcm::FileHelper *tested = new gdcm::FileHelper( filename );
-      if( !tested->GetFile()->IsReadable() )
+
+       // new style 
+      gdcm::File *f = gdcm::File::New();
+      f->SetLoadMode ( gdcm::LD_ALL ); // Load everything
+      f->SetFileName( filename );
+      f->Load();
+ 
+      if( !f->IsReadable() )
       {
         std::cout << " Failed" << std::endl
                    << "      Image not gdcm compatible:"
                   << filename << std::endl;
-        delete tested;
+        f->Delete();
         return 1;
       }
-
+      gdcm::FileHelper *tested = gdcm::FileHelper::New( f );
+     
       ////// Step 2:
       ////// Check for existence of reference baseline dicom file:
       std::cout << "2...";
@@ -435,7 +443,8 @@ int InternalTest(std::string const &filename,
                    << "      Image not Testing compatible:"
                   << filename << std::endl;
          delete reference;
-         delete tested;
+         tested->Delete();
+         f->Delete();
          return 1;
       }
 
@@ -462,7 +471,8 @@ int InternalTest(std::string const &filename,
                    << "Z: " << tested->GetFile()->GetZSize() << " # " 
                    << reference->GetZSize() << std::endl;
          delete reference;
-         delete tested;
+         tested->Delete();
+         f->Delete();
          return 1;
       }
 
@@ -475,9 +485,11 @@ int InternalTest(std::string const &filename,
                    << "        Scalar size: " << tested->GetFile()->GetPixelSize() << " # " 
                    << reference->GetScalarSize() << std::endl
                    << "        Number of scalar: " << tested->GetFile()->GetNumberOfScalarComponents() << " # " 
-                   << reference->GetNumberOfComponents() << std::endl;
+                   << reference->GetNumberOfComponents() << std::endl
+                   << "        Pixel type: " << tested->GetFile()->GetPixelType() << std::endl;
          delete reference;
-         delete tested;
+         tested->Delete();
+         f->Delete();
          return 1;
       }
 
@@ -495,8 +507,9 @@ int InternalTest(std::string const &filename,
                    << tested->GetFile()->GetYSize() << ","
                    << tested->GetFile()->GetZSize() << ")"
                    << std::endl;
-         delete tested;
+         tested->Delete();
          delete reference;
+         f->Delete();
          return 1;
       }
 
@@ -533,14 +546,16 @@ int InternalTest(std::string const &filename,
          }
          std::cout << std::endl;
 
-         delete tested;
+         tested->Delete();
          delete reference;
+         f->Delete();
          return 1;
       }
 
       //////////////// Clean up:
-      delete tested;
+      tested->Delete();
       delete reference;
+      f->Delete();
 
       std::cout << "OK." << std::endl;
       
@@ -549,7 +564,10 @@ int InternalTest(std::string const &filename,
 
 int TestAllReadCompareDicom(int argc, char *argv[]) 
 {
-   if ( argc == 3 )
+   if (argc == 4)
+      gdcm::Debug::DebugOn();
+
+   if ( argc >= 3 )
    {
       // The test is specified a specific filename, use it instead of looping
       // over all images
@@ -557,7 +575,7 @@ int TestAllReadCompareDicom(int argc, char *argv[])
       const std::string reference = argv[2];
       return InternalTest( input, reference );
    }
-   else if ( argc > 3 || argc == 2 )
+   else if ( argc > 4 || argc == 2 )
    {
       std::cerr << "   Usage: " << argv[0]
                 << " (no arguments needed)." << std::endl;