X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FVTKTestRead.cxx;h=6a0838507471944d38eacf726508d1707607b670;hb=d00078b5e19310b379c8339fa8fe38362e8ca392;hp=4a6dc5d093d54d5c97e1a1e1577f18ec3bd07d5f;hpb=e6ff7dc295436e9463650ea13ab965ce35ae126c;p=gdcm.git

diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx
index 4a6dc5d0..6a083850 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/19 10:43:01 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/01/20 16:16:59 $
+  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"
@@ -52,7 +52,7 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    // Instead of directly reading the dicom let's write it down to another file
    // do a scope to be sure everything gets cleanup
    {
-      gdcm::File file( filename );
+      gdcm::FileHelper file( filename );
       file.GetImageData();
       file.SetWriteModeToRaw();
       file.WriteDcmExplVR( "TestWrite.dcm" );
@@ -64,6 +64,7 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    reader->SetFileName( "TestWrite.dcm" );
    reader->Update();
 
+   double *range=reader->GetOutput()->GetScalarRange();
    int dim[3];
    reader->GetOutput()->GetDimensions( dim );
 
@@ -72,7 +73,6 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
    {
       viewer->SetInput ( reader->GetOutput() );
 
-      vtkFloatingPointType *range = reader->GetOutput()->GetScalarRange();
       viewer->SetColorWindow (range[1] - range[0]);
       viewer->SetColorLevel (0.5 * (range[1] + range[0]));
 
@@ -109,6 +109,7 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
       clip->SetInput(image);
       clip->SetOutputWholeExtent(ext[0],ext[1],ext[2],ext[3],
                                  ext[4]+dim[2] / 2,ext[4]+dim[2] / 2);
+      clip->ClipDataOn();
       vtkImageTranslateExtent *translat=vtkImageTranslateExtent::New();
       translat->SetInput(clip->GetOutput());
       translat->SetTranslation(0,0,-ext[4]-dim[2] / 2);
@@ -125,12 +126,11 @@ int VTKReadTest(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);
@@ -210,7 +210,8 @@ int VTKTestRead(int argc, char *argv[])
    {
       ret = VTKReadTest(t,viewer,argv[1+show],argv[2+show],show);
       t->Delete();
-      viewer->Delete();
+      if( viewer )
+         viewer->Delete();
 
       return ret;
    }
@@ -236,7 +237,8 @@ int VTKTestRead(int argc, char *argv[])
       ret += VTKReadTest(t,viewer,filename,pngfile,show);
    }
    t->Delete();
-   viewer->Delete();
+   if( viewer )
+      viewer->Delete();
 
    return ret;
 }