#3113 crea Rigid Registration Bug New Normal - branch vtk7itk4 compilation with...

[creaRigidRegistration.git] / lib / Transparency.cxx

diff --git a/lib/Transparency.cxx b/lib/Transparency.cxx
index 335bf32779cd75ae6faa96ac6f195620872667a4..874968555fb68b43109df524653f919f25abfe5c 100644 (file)
--- a/lib/Transparency.cxx
+++ b/lib/Transparency.cxx
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 "Transparency.h"
 
 
@@ -62,7 +88,12 @@ void Transparency::calculateImage()
                vtkImageData *result;
                if(numPixelsImg1<numPixelsImg2)
                {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        resample->SetInput(_image1);
+#else
+                       resample->SetInputData(_image1);
+#endif
                        factorX = (double)extImg2[1]/extImg1[1];
                        factorY = (double)extImg2[3]/extImg1[3];
                        resample->SetAxisMagnificationFactor(0,factorX);
@@ -70,14 +101,31 @@ void Transparency::calculateImage()
                        resample->SetInformationInput(_image2);
 
                        initialize(dimImg2, spcImg2);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       //..
+#else
+                       resample->Update();
+#endif
+
                        result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        result->Update();
+#else
+                       //...
+#endif
                        createImage(result,_image2,dimImg2[0],dimImg2[1]);              
                        
                } //if
                else if (numPixelsImg1>numPixelsImg2)
                {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        resample->SetInput(_image2);
+#else
+                       resample->SetInputData(_image2);
+#endif
                        factorX = (double)extImg1[1]/extImg2[1];
                        factorY = (double)extImg1[3]/extImg2[3];
                        resample->SetAxisMagnificationFactor(0,factorX);
@@ -85,9 +133,21 @@ void Transparency::calculateImage()
                        resample->SetInformationInput(_image1);
 
                        initialize(dimImg1, spcImg1);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       // ...
+#else
+                       resample->Update();
+#endif
                        result = resample->GetOutput();
                        
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        result->Update();
+#else
+                       result->Modified();
+#endif
 
                        createImage(_image1,result,dimImg1[0],dimImg1[1]);
                } // else if
@@ -95,17 +155,33 @@ void Transparency::calculateImage()
                {
                        //If both images have the same number of pixels, the resultant image will have the 
                        //properties of the first image.
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        resample->SetInput(_image2);
+#else
+                       resample->SetInputData(_image2);
+#endif
                        factorX = (double)extImg1[1]/extImg2[1];
                        factorY = (double)extImg1[3]/extImg2[3];
                        resample->SetAxisMagnificationFactor(0,factorX);
                        resample->SetAxisMagnificationFactor(1,factorY);
                        resample->SetInformationInput(_image1);
-
                        initialize(dimImg1, spcImg1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       // ...
+#else
+                       resample->Update();
+#endif
 
                        result = resample->GetOutput();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        result->Update();
+#else
+                       result->Modified();
+#endif
                        
                        createImage(_image1,result,dimImg1[0],dimImg1[1]);
 
@@ -120,11 +196,17 @@ void Transparency::initialize(int dimensions[], double spacing[])
 {
        // Setting the new image
        _newImage = vtkImageData::New();
-       _newImage->SetScalarType(_type);
        _newImage->SetSpacing(spacing);
        _newImage->SetDimensions(dimensions);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+       _newImage->SetScalarType(_type);
        _newImage->AllocateScalars();
        _newImage->Update();
+#else
+       _newImage->AllocateScalars(_type,1);
+#endif
+
 
 }
 
@@ -232,7 +314,14 @@ void Transparency::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
        }
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _newImage->Update();
+#else
+       _newImage->Modified();
+#endif
+
+
 }
 
 template <class T>