#3338 BBTK Feature New Normal - MAthOperation round rint floor trunc

diff --git a/packages/std/src/bbstdMathOperation.cxx b/packages/std/src/bbstdMathOperation.cxx
index ee22c24468cf353f5bb8429bf46f8046a796848a..a0cd94477d63a30ae6aeb77c871060245874a71d 100644 (file)
--- a/packages/std/src/bbstdMathOperation.cxx
+++ b/packages/std/src/bbstdMathOperation.cxx
@@ -87,6 +87,11 @@ void MathOperation::Process()
     if (bbGetInputType()==19) bbSetOutputOut(  (int)bbGetInputIn1() % (int)bbGetInputIn2() );
     if (bbGetInputType()==20) if (bbGetInputIn1()<(int)bbGetInputIn2()) { bbSetOutputOut(1); } else { bbSetOutputOut(0); } ;
     if (bbGetInputType()==21) if (bbGetInputIn1()>(int)bbGetInputIn2()) { bbSetOutputOut(1); } else { bbSetOutputOut(0); } ;
+    if (bbGetInputType()==22) bbSetOutputOut( round( bbGetInputIn1() ) );
+    if (bbGetInputType()==23) bbSetOutputOut( rint( bbGetInputIn1() ) );
+    if (bbGetInputType()==24) bbSetOutputOut( floor( bbGetInputIn1() ) );
+    if (bbGetInputType()==25) bbSetOutputOut( ceil( bbGetInputIn1() ) );
+    if (bbGetInputType()==26) bbSetOutputOut( trunc( bbGetInputIn1() ) );
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)

diff --git a/packages/std/src/bbstdMathOperation.h b/packages/std/src/bbstdMathOperation.h
index 8d6d8ee86bef940fdc9bea57184c6612395ac9b7..a167679fc45867734b7cbdde351ce28c294c1939 100644 (file)
--- a/packages/std/src/bbstdMathOperation.h
+++ b/packages/std/src/bbstdMathOperation.h
@@ -42,7 +42,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(MathOperation,bbtk::AtomicBlackBox);
   BBTK_CATEGORY("empty");
   BBTK_INPUT(MathOperation,In1,"First input",double,"");
   BBTK_INPUT(MathOperation,In2,"Second input",double,"");
-  BBTK_INPUT(MathOperation,Type,"Type (defalult 0): 0  adition (default), 1 sustraction In1-In2, 2 multiplication In1*In2, 3 divisiuon In1/In2, 4 sqrt In1, 5 log In1, 6 exp In1, 7 incremental int [In1..In2], 8 random int [In1..In2], 9 sin In1-rad, 10 cos In1-rad, 11 tan In1-rad, 12 asin In 1, 13 acos In1, 14 atan In1, 15 atan2 In1 In2 , 16 min, 17 max, 18 abs In1, 19 module In1%In2 , 20 lessThan In1<In2, 21 greaterThan In1>In2",int,"");
+  BBTK_INPUT(MathOperation,Type,"Type (defalult 0): 0  adition (default), 1 sustraction In1-In2, 2 multiplication In1*In2, 3 divisiuon In1/In2, 4 sqrt In1, 5 log In1, 6 exp In1, 7 incremental int [In1..In2], 8 random int [In1..In2], 9 sin In1-rad, 10 cos In1-rad, 11 tan In1-rad, 12 asin In 1, 13 acos In1, 14 atan In1, 15 atan2 In1 In2 , 16 min, 17 max, 18 abs In1, 19 module In1%In2 , 20 lessThan In1<In2, 21 greaterThan In1>In2, 22 round In1, 23 rint In1, 24 floor In1, 25 ceil In1, 26 trunc In1",int,"");
 
   BBTK_OUTPUT(MathOperation,Out,"Output",double,"");
 BBTK_END_DESCRIBE_BLACK_BOX(MathOperation);

diff --git a/packages/vtk/src/bbvtkCreateImage.cxx b/packages/vtk/src/bbvtkCreateImage.cxx
index 007c34718cc779e17897a44f3ddd81ec35f4dddc..c534252a5b3452d7c440b579464a69e342790b80 100644 (file)
--- a/packages/vtk/src/bbvtkCreateImage.cxx
+++ b/packages/vtk/src/bbvtkCreateImage.cxx
@@ -99,10 +99,7 @@ void CreateImage::Process()
                spc[2]=1;
        }
 //EED 2017-12-7
-       if (imageoutput!=NULL) 
-       {
-               imageoutput->Delete();
-       }       
+       if (imageoutput!=NULL) {imageoutput->Delete();} 
        imageoutput = vtkImageData::New();
        imageoutput->Initialize();
        imageoutput->SetSpacing( spc );