+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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
ope->SetInput1((vtkDataObject*)bbGetInputIn1());
- ope->SetConstantK(bbGetInputInConstant());
- ope->SetConstantC(bbGetInputInConstant());
+ ope->SetConstantK( bbGetInputInConstant() );
+// ope->SetConstantC(bbGetInputInConstant());
switch (bbGetInputOperation())
{
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();
ope->SetOperationToLog();
break;
+ case 9:
+ ope->SetOperationToAbsoluteValue();
+ break;
+
+
+/* EED 21Juin 2011 Borrame
case 10:
substractWithMinimum();
bbSetOutputOut(constante);
bbSetOutputOut(constante);
return;
break;
+*/
+
default:
std::cout << "Invalid Operation" << std::endl;
return;