Stage 2 of names normalization :

[gdcm.git] / Testing / VTKTestReadSeq.cxx

diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx
index 8084618543c642909e9e7eaa02f41cc3af696770..77d0c30ecf0ea24e4bde75cfcb6a4a1a6b4d338b 100644 (file)
--- 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 10:49:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/20 16:31:42 $
+  Version:   $Revision: 1.5 $
                                                                                 
   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"
@@ -64,12 +64,14 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
    delete[] newFileDcm;
    reader->Update();
 
+   double *range = reader->GetOutput()->GetScalarRange();
+
+   // Show
    if( show )
    {
       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]));
 
@@ -110,6 +112,7 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
       vtkImageClip *clip=vtkImageClip::New();
       clip->SetInput(image);
       clip->SetOutputWholeExtent(ext[0],ext[1],ext[2],ext[3],j,j);
+      clip->ClipDataOn();
       vtkImageTranslateExtent *translat=vtkImageTranslateExtent::New();
       translat->SetInput(clip->GetOutput());
       translat->SetTranslation(0,0,-j);
@@ -125,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);
@@ -215,7 +217,8 @@ int VTKTestReadSeq(int argc, char *argv[])
    {
       ret = VTKReadSeqTest(t,viewer,argv[1+show],argv[2+show],show);
       t->Delete();
-      viewer->Delete();
+      if( viewer )
+         viewer->Delete();
 
       return ret;
    }
@@ -238,7 +241,7 @@ int VTKTestReadSeq(int argc, char *argv[])
       ret += VTKReadSeqTest(t,viewer,filename,pngfile,show);
    }
    t->Delete();
-   if(viewer)
+   if( viewer )
       viewer->Delete();
 
    return ret;