X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FVTKTestRead.cxx;h=f17b7512e71605fa86e655b58349d3f10b3085fa;hb=e791cd8644440c585d94fb5294d24b8fa2157cf7;hp=5efa883876e3e68d88f90b94586a30df1e6abc8a;hpb=9636b7985d0cef5b248e7ace7ddb3ef9a9e14170;p=gdcm.git

diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx
index 5efa8838..f17b7512 100644
--- a/Testing/VTKTestRead.cxx
+++ b/Testing/VTKTestRead.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestRead.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/22 22:51:40 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/02/09 15:31:15 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmFileHelper.h"
 #include "vtkGdcmReader.h"
 #include "vtkImageViewer.h"
 #include "vtkImageData.h"
@@ -25,6 +24,8 @@
 #include "vtkImageAppendComponents.h"
 #include "vtkImageShiftScale.h"
 
+#include "vtkPNGWriter.h"
+
 #include <iostream>
 
 //Generated file:
@@ -35,12 +36,10 @@
 #endif
 
 int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
-                std::string const & filename, 
-                std::string const & referenceFileName,
-                bool show )
+                std::string const &filename, 
+                std::string const &referenceFileName)
 {
    int retVal = 0;  //by default this is an error
-   (void)show;
 
    t->CleanArguments();
    t->AddArgument("-D");
@@ -50,22 +49,12 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    t->AddArgument("-T");
    t->AddArgument( "." );
    
-   // Instead of directly reading the dicom let's write it down to another file
-   // do a scope to be sure everything gets cleanup
-   {
-      gdcm::FileHelper file( filename );
-      file.GetImageData();
-      file.SetWriteModeToRaw();
-      file.WriteDcmExplVR( "TestWrite.dcm" );
-   }
- 
-   // Ok for now still use the original image, 
    vtkGdcmReader *reader = vtkGdcmReader::New();
-   //reader->SetFileName( filename.c_str() );
-   reader->SetFileName( "TestWrite.dcm" );
+   reader->SetFileName( filename.c_str() );
    reader->Update();
 
-   double *range=reader->GetOutput()->GetScalarRange();
+   double range[2];
+   reader->GetOutput()->GetScalarRange(range);
    int dim[3];
    reader->GetOutput()->GetDimensions( dim );
 
@@ -126,7 +115,6 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
 
    // Set an unsigned char image
    // Shift/Scale the image 
-   image->Update();
    vtkImageShiftScale *iss=vtkImageShiftScale::New();
    iss->SetInput(image);
    iss->SetOutputScalarTypeToUnsignedChar();
@@ -194,7 +182,7 @@ int VTKTestRead(int argc, char *argv[])
    }
 
    int ret = 0;
-   vtkTesting* t = vtkTesting::New();
+   vtkTesting *t = vtkTesting::New();
    vtkImageViewer *viewer;
    if( show )
       viewer = vtkImageViewer::New();
@@ -209,7 +197,7 @@ int VTKTestRead(int argc, char *argv[])
    }
    else
    {
-      ret = VTKReadTest(t,viewer,argv[1+show],argv[2+show],show);
+      ret = VTKReadTest(t,viewer,argv[1+show],argv[2+show]);
       t->Delete();
       if( viewer )
          viewer->Delete();
@@ -235,7 +223,7 @@ int VTKTestRead(int argc, char *argv[])
       pngfile.insert( 0, "Baseline/");
       //std::cerr << "PNG file: " << pngfile << std::endl;
 
-      ret += VTKReadTest(t,viewer,filename,pngfile,show);
+      ret += VTKReadTest(t,viewer,filename,pngfile);
    }
    t->Delete();
    if( viewer )