X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkBinaryOperations.cxx;h=f58c6ecd642af8bb16c110e4717fcb350b54d98a;hb=a061a18c9335da6145bd87cc17f2572dce7ccab5;hp=abf08b8eadb90adfb2796653cfa239d9191676b2;hpb=36ba94ecef3d633c2bcd8643918671b896c81124;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index abf08b8..f58c6ec 100644
--- 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
@@ -57,12 +84,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();
 
@@ -70,7 +104,7 @@ void BinaryOperations::Process()
 	bbSignalOutputModification();
 
 }
-	
+
 
 void BinaryOperations::bbUserSetDefaultValues()
 {
@@ -82,10 +116,9 @@ void BinaryOperations::bbUserSetDefaultValues()
    bbSetOutputOut(NULL);
    bbSetInputOperation(0);
    ope = vtkImageMathematics::New();
-   constante = NULL;
 }
-	
-	
+
+
 void BinaryOperations::bbUserInitializeProcessing()
 {
 
@@ -95,8 +128,8 @@ void BinaryOperations::bbUserInitializeProcessing()
 //    if any
 
 }
-	
-	
+
+
 void BinaryOperations::bbUserFinalizeProcessing()
 {