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

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

diff --git a/packages/vtk/src/bbvtkUnaryOperations.cxx b/packages/vtk/src/bbvtkUnaryOperations.cxx
index 7424ccd5a4ed7a855d08ad89e02ec747287eaf80..dfc3cc9a894a56d0a9328ed7a3ca1503ee1c1fab 100644 (file)
--- a/packages/vtk/src/bbvtkUnaryOperations.cxx
+++ b/packages/vtk/src/bbvtkUnaryOperations.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 "bbvtkUnaryOperations.h"
 #include "bbvtkPackage.h"
 namespace bbvtk
@@ -30,8 +57,8 @@ void UnaryOperations::Process()
        ope->SetInput1((vtkDataObject*)bbGetInputIn1());
 
 
-       ope->SetConstantK(bbGetInputInConstant());
-       ope->SetConstantC(bbGetInputInConstant());
+       ope->SetConstantK( bbGetInputInConstant() );
+//     ope->SetConstantC(bbGetInputInConstant());
 
        switch (bbGetInputOperation())
        {
@@ -40,25 +67,22 @@ void UnaryOperations::Process()
 
                break;
                case 1:
-//EED Borrame                          crearPredeterminado();
-                               ope->SetInput2((vtkDataSet*) constante);
-                               ope->SetOperationToSubtract();
+                               ope->SetConstantK( -1.0 * bbGetInputInConstant() );
+                               ope->SetOperationToAddConstant();
                break;
                case 2:
-                ope->SetInput2((vtkDataSet*) constante);
-                               ope->SetOperationToMultiply();
+                               ope->SetOperationToMultiplyByK();
+printf("EED UnaryOperations::Process()  2 \n");
 
                break;
                case 3:
-
-                               ope->SetOperationToDivide();
+                               ope->SetConstantK( 1.0/bbGetInputInConstant() );
+                               ope->SetOperationToMultiplyByK();
+printf("EED UnaryOperations::Process()  3 \n");
                break;
                case 4:
                         ope->SetOperationToInvert();
                break;
-               case 9:
-                        ope->SetOperationToAbsoluteValue();
-               break;
                case 5:
 
                                ope->SetOperationToSin();
@@ -76,6 +100,12 @@ void UnaryOperations::Process()
 
                                ope->SetOperationToLog();
                break;
+               case 9:
+                        ope->SetOperationToAbsoluteValue();
+               break;
+
+                       
+/* EED 21Juin 2011 Borrame
                case 10:
                        substractWithMinimum();
                        bbSetOutputOut(constante);
@@ -86,12 +116,15 @@ void UnaryOperations::Process()
                        bbSetOutputOut(constante);
                        return;
                break;
+*/  
+                       
                default:
                        std::cout << "Invalid Operation" << std::endl;
                        return;
                break;
        }
 
+       ope->Modified();
        ope->Update();
        vtkImageData* salida = ope->GetOutput();
 
@@ -99,7 +132,7 @@ void UnaryOperations::Process()
        bbSignalOutputModification();
 
 }
-       
+
 /* Borrame Eduardo - Juan Pablo
 void UnaryOperations::crearPredeterminado()
 {
@@ -131,7 +164,7 @@ void UnaryOperations::crearPredeterminado()
 }
 */
 
-       
+
 void UnaryOperations::substractWithMinimum()
 {
        int ext[6];
@@ -168,41 +201,6 @@ void UnaryOperations::substractWithMinimum()
        }
 }
 
-void UnaryOperations::MultiplyBy()
-{
-       int ext[6];
-       double spc[3];
-       vtkImageData* inicial = bbGetInputIn1();
-
-
-       if (constante == NULL)
-       {
-               inicial->GetExtent(ext);
-               inicial->GetSpacing(spc);
-               constante = vtkImageData::New();
-               constante->SetExtent(ext);
-               constante->SetSpacing(spc);
-               constante->SetOrigin(inicial->GetOrigin());
-               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++)
-                       {
-                               double temp1 = lector.getPixelValue(i,j,k,inicial);
-                               double temp = temp1 * bbGetInputInConstant();
-                               if (temp < 0)
-                                       temp = 0;
-                               lector.setPixelValue(i,j,k,constante,temp);
-                       }
-               }
-       }
-}
 
 void UnaryOperations::bbUserSetDefaultValues()
 {
@@ -210,7 +208,6 @@ void UnaryOperations::bbUserSetDefaultValues()
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX
 //    Here we initialize the input 'In' to 0
    bbSetInputIn1(NULL);
-//   bbSetInputIn2(NULL);
    bbSetOutputOut(NULL);
    bbSetInputInConstant(0);
    bbSetInputOperation(0);