X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkBinaryOperations.cxx;h=0e2a523f2b5b4d4193843cb410395b7f8193b10f;hb=72100b5cd3240189ea096777f4088e49c2120ca8;hp=abf08b8eadb90adfb2796653cfa239d9191676b2;hpb=36ba94ecef3d633c2bcd8643918671b896c81124;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index abf08b8..0e2a523 100644
--- a/packages/vtk/src/bbvtkBinaryOperations.cxx
+++ b/packages/vtk/src/bbvtkBinaryOperations.cxx
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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 "bbvtkBinaryOperations.h"
 #include "bbvtkPackage.h"
 namespace bbvtk
@@ -8,7 +35,6 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,BinaryOperations)
 BBTK_BLACK_BOX_IMPLEMENTATION(BinaryOperations,bbtk::AtomicBlackBox);
 void BinaryOperations::Process()
 {
-
 // THE MAIN PROCESSING METHOD BODY
 //   Here we simply set the input 'In' value to the output 'Out'
 //   And print out the output value
@@ -23,25 +49,32 @@ void BinaryOperations::Process()
 
 	if (bbGetInputIn1() == NULL)
 	{
-		std::cout << "Set In1 at least" << std::endl;
+		std::cout << "EED BinaryOperations::Process  Set In1 at least" << std::endl;
 		return;
 	}
 
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	ope->SetInput1((vtkDataObject*)bbGetInputIn1());
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	ope->SetInput1Data((vtkDataObject*)bbGetInputIn1());
+#endif
 
 	if (bbGetInputIn2() != NULL)
 	{
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 		ope->SetInput2((vtkDataObject*)bbGetInputIn2());
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		ope->SetInput2Data((vtkDataObject*)bbGetInputIn2());
+#endif
 
-	}
-	else
-	{
-	    std::cout << "Set In2" << std::endl;
+	} else {
+	    std::cout << "EED BinaryOperations::Process  Set In2" << std::endl;
         return;
 	}
-
-
-
 	switch (bbGetInputOperation())
 	{
 		case 0:
@@ -57,20 +90,24 @@ void BinaryOperations::Process()
 		case 3:
 				ope->SetOperationToDivide();
 		break;
+		case 4:
+				ope->SetOperationToMax();
+		break;
+		case 5:
+				ope->SetOperationToMin();
+		break;
 		default:
 			std::cout << "Invalid Operation" << std::endl;
 			return;
 		break;
 	}
-
+	ope->Modified();
 	ope->Update();
 	vtkImageData* salida = ope->GetOutput();
-
 	bbSetOutputOut(salida);
-	bbSignalOutputModification();
-
+//	bbSignalOutputModification();
 }
-	
+
 
 void BinaryOperations::bbUserSetDefaultValues()
 {
@@ -82,10 +119,9 @@ void BinaryOperations::bbUserSetDefaultValues()
    bbSetOutputOut(NULL);
    bbSetInputOperation(0);
    ope = vtkImageMathematics::New();
-   constante = NULL;
 }
-	
-	
+
+
 void BinaryOperations::bbUserInitializeProcessing()
 {
 
@@ -95,8 +131,8 @@ void BinaryOperations::bbUserInitializeProcessing()
 //    if any
 
 }
-	
-	
+
+
 void BinaryOperations::bbUserFinalizeProcessing()
 {