Clean code

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

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index 4689f75c0800e441308ac1510a341e3c1a98f880..e65289adea8929978a0afb1413f4b4124c909384 100644 (file)
--- 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;
+               printf( "EED Warning!!!  (%s)  BinaryOperations::Process  Set In1 at least", bbGetFullName().c_str() );
                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 {
+        printf( "EED Warning!!!  (%s)  BinaryOperations::Process  Set In2 at least", bbGetFullName().c_str() );
         return;
        }
-
-
-
        switch (bbGetInputOperation())
        {
                case 0:
@@ -84,18 +90,22 @@ 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();
 }