#135 BBTK Feature New Normal - branch vtk7itk4wx3

[bbtk.git] / packages / vtk / src / bbvtkBinaryOperations.cxx

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index 4689f75c0800e441308ac1510a341e3c1a98f880..106ceb27eb8c33530d01012d2f4e9c746fa2c363 100644 (file)
--- 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();