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

[creaRigidRegistration.git] / lib / CheckBoard.cpp

diff --git a/lib/CheckBoard.cpp b/lib/CheckBoard.cpp
index a0ae2d74423d1a9dc21a4ae4039a1d72d2bb2c75..08fa729fab2323686e69d07fb9d54ffe9969b048 100644 (file)
--- a/lib/CheckBoard.cpp
+++ b/lib/CheckBoard.cpp
@@ -1,20 +1,44 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 "CheckBoard.h"
 
 /*
 * Constructor
 */
 //------------------------------------------------------------
-CheckBoard::CheckBoard()
-:              // use 'Initialization List'! //JPR
-       image1(NULL);
-       image2(NULL);
-       squaresX(0);
-       squaresY(0);
-       newImage(NULL);
-       processed(false);
-       newImage(NULL);
-       resample(NULL);
-       result(NULL);
+CheckBoard::CheckBoard() :             
+       image1(NULL),
+       image2(NULL),
+       squaresX(0),
+       squaresY(0),
+       newImage(NULL),
+       processed(false),
+       resample(NULL),
+       result(NULL)
 {
 /*
        image1=NULL;
@@ -80,31 +104,64 @@ void CheckBoard::calculateImage()
                result = vtkImageData::New();
                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);
                        resample->SetAxisMagnificationFactor(1,factorY);
                        resample->SetInformationInput(image2);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       resample->Update();
+#else
+                       // ..
+#endif
 
                        initialize(dimImg2, spcImg2);
                        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);
                        resample->SetAxisMagnificationFactor(1,factorY);
                        resample->SetInformationInput(image1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       // ..
+#else
+                       resample->Update();
+#endif
 
                        initialize(dimImg1, spcImg1);
                        result = resample->GetOutput();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        result->Update();
+#else
+                       // ..
+#endif
 
                        createImage(image1,result,dimImg1[0],dimImg1[1]);
                } // else if
@@ -112,17 +169,33 @@ void CheckBoard::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);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       // ..
+#else
+                       resample->Update();
+#endif
 
                        initialize(dimImg1, spcImg1);
 
                        result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        result->Update();
+#else
+  //...
+#endif
 
                        createImage(image1,result,dimImg1[0],dimImg1[1]);
 
@@ -141,11 +214,18 @@ void CheckBoard::initialize(int dimensions[], double spacing[])
                        newImage->Delete();
        }
        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
+
 }
 
 //------------------------------------------------------------
@@ -255,7 +335,13 @@ void CheckBoard::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX,
        }
 
        //std::cout << "The image has been checkboardized!" << std::endl;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    newImage->Update();
+#else
+   newImage->Modified();
+#endif
+
 //   newImage->Modified();
 }
 /**Template used for the different image types