2344 BBTK Bug New Normal Conflict between Update and Modfied vtk filters

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

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index 748357bcad6c345ba6bfebfb95d2a66c0d2e765a..774cd19140321341105b56bc4b0751b009e563ab 100644 (file)
--- 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
@@ -63,6 +90,7 @@ void BinaryOperations::Process()
                break;
        }
 
+       ope->Modified();
        ope->Update();
        vtkImageData* salida = ope->GetOutput();
 
@@ -70,34 +98,6 @@ void BinaryOperations::Process()
        bbSignalOutputModification();
 
 }
-void BinaryOperations::crearPredeterminado()
-{
-       int ext[6];
-       vtkImageData* inicial = bbGetInputIn1();
-
-
-       if (constante == NULL)
-       {
-               inicial->GetExtent(ext);
-               constante = vtkImageData::New();
-               constante->SetExtent(ext);
-               constante->SetScalarType(inicial->GetScalarType());
-               constante->AllocateScalars();
-               constante->Update();
-       }
-
-       for (int i=ext[0]; i<=ext[1]; i++)
-       {
-               for (int j=ext[2]; j<=ext[3]; j++)
-               {
-                       for (int k=ext[4]; k<=ext[5]; k++)
-                       {
-                               unsigned short* value = (unsigned short*)constante->GetScalarPointer(i,j,k);
-                               *value = bbGetInputInConstant();
-                       }
-               }
-       }
-}
 
 
 void BinaryOperations::bbUserSetDefaultValues()
@@ -108,10 +108,11 @@ void BinaryOperations::bbUserSetDefaultValues()
    bbSetInputIn1(NULL);
    bbSetInputIn2(NULL);
    bbSetOutputOut(NULL);
-   bbSetInputInConstant(0);
+   bbSetInputOperation(0);
    ope = vtkImageMathematics::New();
-   constante = NULL;
 }
+
+
 void BinaryOperations::bbUserInitializeProcessing()
 {
 
@@ -120,8 +121,9 @@ void BinaryOperations::bbUserInitializeProcessing()
 //    but this is where you should allocate the internal/output pointers
 //    if any
 
-
 }
+
+
 void BinaryOperations::bbUserFinalizeProcessing()
 {