+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
#include "Convolution.h"
/*
//------------------------------------------------------------
Convolution::Convolution()
{
- _image=NULL;
- _convolve = vtkImageConvolve::New();
- _cast = vtkImageCast::New();
+ _image = NULL;
+ _convolve = vtkImageConvolve::New();
+ _cast = vtkImageCast::New();
}
/*
//------------------------------------------------------------
Convolution::~Convolution()
{
- if (_convolve != NULL ) { _convolve->Delete(); }
- if (_cast != NULL ) { _cast->Delete(); }
+ if (_convolve != NULL ) { _convolve->Delete(); }
+ if (_cast != NULL ) { _cast->Delete(); }
}
vtkImageData *Convolution::getImage()
void Convolution::setImage(vtkImageData *image)
{
_image = image;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_convolve->SetInput(_image);
+#else
+ _convolve->SetInputData(_image);
+#endif
}
void Convolution::setFactor(double factor)
{
- _factor = (factor/100.0)*5.0;
+// _factor = (factor/100.0)*5.0;
+ _factor = factor;
}
void Convolution::setOn(bool on)
void Convolution::Run()
{
- if(_on)
+ if(_on==true)
{
double kernel[] = {0.0,1.0,0.0,1.0,-_factor,1.0,0.0,1.0,0.0};
_convolve->SetKernel3x3(kernel);
_convolve->Update();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_cast->SetInput(_convolve->GetOutput());
- _cast->SetOutputScalarTypeToDouble();
+#else
+ _cast->SetInputData(_convolve->GetOutput());
+#endif
+ //_cast->SetOutputScalarTypeToDouble();
_cast->Update();
- }
- else
- {
+ } else {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_cast->SetInput(_image);
+#else
+ _cast->SetInputData(_image);
+#endif
_cast->SetOutputScalarType(_image->GetScalarType());
_cast->Update();
- }
-}
\ No newline at end of file
+ } // if _on
+}