X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fvtk%2Fsrc%2FbbvtkBinaryOperations.cxx;h=106ceb27eb8c33530d01012d2f4e9c746fa2c363;hb=e269992d2d446784afc40073782311deaa25008f;hp=4689f75c0800e441308ac1510a341e3c1a98f880;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index 4689f75..106ceb2 100644
--- a/packages/vtk/src/bbvtkBinaryOperations.cxx
+++ b/packages/vtk/src/bbvtkBinaryOperations.cxx
@@ -54,15 +54,25 @@ void BinaryOperations::Process()
 		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
-	{
+	} else {
 	    std::cout << "Set In2" << std::endl;
         return;
 	}
@@ -84,12 +94,19 @@ 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();