From: regrain <regrain>
Date: Wed, 19 Jan 2005 14:45:40 +0000 (+0000)
Subject:    * Test/VTKTest*.cxx : one more bug stilled
X-Git-Tag: Version1.0.bp~247
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7f4872909d3051086acdc83ab6eceb2a14e92f4b;p=gdcm.git

   * Test/VTKTest*.cxx : one more bug stilled
   -- BeNours
---

diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx
index b4ba7ea1..29089d91 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 13:50:11 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/01/19 14:45:40 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -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]));
 
@@ -126,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);
diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx
index 773c9671..c2e44aba 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/19 14:45:40 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -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]));
 
@@ -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);
diff --git a/Testing/VTKTestWrite.cxx b/Testing/VTKTestWrite.cxx
index 2d9614e0..26be4111 100644
--- a/Testing/VTKTestWrite.cxx
+++ b/Testing/VTKTestWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/19 13:50:11 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/01/19 14:45:40 $
+  Version:   $Revision: 1.4 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,6 +69,7 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
    reader->SetFileName( "TestWrite.dcm" );
    reader->Update();
 
+   double *range=reader->GetOutput()->GetScalarRange();
    int dim[3];
    reader->GetOutput()->GetDimensions( dim );
 
@@ -77,7 +78,6 @@ int VTKWriteTest(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]));
 
@@ -131,12 +131,11 @@ int VTKWriteTest(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);