X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FVTKTestReadSeq.cxx;h=1bc77c1d62b9737aae1acc36922f3e6ce7f907db;hb=87646d4e5c20b474db05756f796ccffab2babc4e;hp=773c9671a0bf92192dbebaa855cc117c8856db1d;hpb=a9405cdbae88cf5bef6f6fa5883d2502563c3914;p=gdcm.git

diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx
index 773c9671..1bc77c1d 100644
--- a/Testing/VTKTestReadSeq.cxx
+++ b/Testing/VTKTestReadSeq.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestReadSeq.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/19 13:50:11 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/01/25 15:45:49 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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,7 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 #include "vtkGdcmReader.h"
 #include "vtkImageViewer.h"
 #include "vtkImageData.h"
@@ -36,8 +36,7 @@
 
 int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
                    std::string const & filename, 
-                   std::string const & referenceFileName,
-                   bool show )
+                   std::string const & referenceFileName)
 {
    int retVal = 0;  //by default this is an error
 
@@ -64,12 +63,15 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
    delete[] newFileDcm;
    reader->Update();
 
-   if( show )
+   double range[2];
+   reader->GetOutput()->GetScalarRange(range);
+
+   // Show
+   if( viewer )
    {
       viewer->SetInput ( reader->GetOutput() );
       viewer->OffScreenRenderingOff();
 
-      vtkFloatingPointType *range = reader->GetOutput()->GetScalarRange();
       viewer->SetColorWindow (range[1] - range[0]);
       viewer->SetColorLevel (0.5 * (range[1] + range[0]));
 
@@ -126,12 +128,11 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
       // Set an unsigned char image
       // Shift/Scale the image 
       image->Update();
-      double *rng=image->GetScalarRange();
       vtkImageShiftScale *iss=vtkImageShiftScale::New();
       iss->SetInput(image);
       iss->SetOutputScalarTypeToUnsignedChar();
-      iss->SetShift(-rng[0]);
-      iss->SetScale(255.0/(rng[1]-rng[0]));
+      iss->SetShift(-range[0]);
+      iss->SetScale(255.0/(range[1]-range[0]));
       iss->ClampOverflowOn();
 
       image->UnRegister(NULL);
@@ -214,7 +215,7 @@ int VTKTestReadSeq(int argc, char *argv[])
    }
    else
    {
-      ret = VTKReadSeqTest(t,viewer,argv[1+show],argv[2+show],show);
+      ret = VTKReadSeqTest(t,viewer,argv[1+show],argv[2+show]);
       t->Delete();
       if( viewer )
          viewer->Delete();
@@ -237,7 +238,7 @@ int VTKTestReadSeq(int argc, char *argv[])
       pngfile = pngfile.substr(0, dot_pos).append( ".png" );
       pngfile.insert( 0, "Baseline/");
       
-      ret += VTKReadSeqTest(t,viewer,filename,pngfile,show);
+      ret += VTKReadSeqTest(t,viewer,filename,pngfile);
    }
    t->Delete();
    if( viewer )