X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkBinaryOperations.cxx;h=0e2a523f2b5b4d4193843cb410395b7f8193b10f;hb=5ab6a1678119cdff10db5524a400a0ecc3c53580;hp=f58c6ecd642af8bb16c110e4717fcb350b54d98a;hpb=427d8c0ac838ab789a57b28f62a7f9ff243e7b60;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index f58c6ec..0e2a523 100644
--- a/packages/vtk/src/bbvtkBinaryOperations.cxx
+++ b/packages/vtk/src/bbvtkBinaryOperations.cxx
@@ -35,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
@@ -50,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:
@@ -95,14 +101,11 @@ void BinaryOperations::Process()
 			return;
 		break;
 	}
-
 	ope->Modified();
 	ope->Update();
 	vtkImageData* salida = ope->GetOutput();
-
 	bbSetOutputOut(salida);
-	bbSignalOutputModification();
-
+//	bbSignalOutputModification();
 }