X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkUnaryOperations.cxx;h=d6e9601c05da59b1e3be59d05038b014489bb002;hb=afce2a3d72f559d0d8c58f54bc9425f2aebf457f;hp=dd9b65a8c6a6d2210179a918b4721c65b75ecfa7;hpb=e4cc0abc8423e1966a8b0844d3af4c999381afba;p=bbtk.git diff --git a/packages/vtk/src/bbvtkUnaryOperations.cxx b/packages/vtk/src/bbvtkUnaryOperations.cxx index dd9b65a..d6e9601 100644 --- a/packages/vtk/src/bbvtkUnaryOperations.cxx +++ b/packages/vtk/src/bbvtkUnaryOperations.cxx @@ -57,8 +57,8 @@ void UnaryOperations::Process() ope->SetInput1((vtkDataObject*)bbGetInputIn1()); - ope->SetConstantK(bbGetInputInConstant()); - ope->SetConstantC(bbGetInputInConstant()); + ope->SetConstantK( bbGetInputInConstant() ); +// ope->SetConstantC(bbGetInputInConstant()); switch (bbGetInputOperation()) { @@ -67,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(); @@ -103,6 +100,9 @@ void UnaryOperations::Process() ope->SetOperationToLog(); break; + case 9: + ope->SetOperationToAbsoluteValue(); + break; /* EED 21Juin 2011 Borrame