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 11:25:32 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
#include "vtkGdcmReader.h"
#include "vtkImageViewer.h"
#include "vtkImageData.h"
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
delete[] newFileDcm;
reader->Update();
- if( show )
+ double *range = reader->GetOutput()->GetScalarRange();
+
+ // 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]));
// 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);
}
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();
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 )