From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Tue, 21 Mar 2017 10:43:58 +0000 (+0100)
Subject: #3063 BBTK Feature New Normal  -  New box VectorFilterDouble in std package
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3a53b423104eaaefbe0f7432692945e6cff93a22;p=bbtk.git

#3063 BBTK Feature New Normal  -  New box VectorFilterDouble in std package
---

diff --git a/packages/std/src/bbstdVectorFilterDouble.cxx b/packages/std/src/bbstdVectorFilterDouble.cxx
index af17d93..9a948a8 100644
--- a/packages/std/src/bbstdVectorFilterDouble.cxx
+++ b/packages/std/src/bbstdVectorFilterDouble.cxx
@@ -180,6 +180,46 @@ void VectorFilterDouble::Process()
 		} // for pLstVec		
 	} // Type==4
 
+	if (bbGetInputType()==5) // Multiplication  k1
+	{
+		int	ipLstvec;
+		int 	i;
+		int 	size;
+		double  result;
+		for (ipLstvec=0 ; ipLstvec<pLstVec.size() ; ipLstvec++)
+		{
+			size=(*pLstVec[ipLstvec]).size();
+			for (i=0;i<size;i++)
+			{
+				result= (*pLstVec[ipLstvec])[i] * bbGetInputk1() ;
+				(*pLstVecOut[ipLstvec]).push_back( result );				
+			}// for size
+		} // for pLstVec		
+	} // Type==5
+
+	if (bbGetInputType()==6) // Division  k1
+	{
+		int	ipLstvec;
+		int 	i;
+		int 	size;
+		double  result;
+		for (ipLstvec=0 ; ipLstvec<pLstVec.size() ; ipLstvec++)
+		{
+			size=(*pLstVec[ipLstvec]).size();
+			for (i=0;i<size;i++)
+			{
+				if (bbGetInputk1()!=0)
+				{
+					result= (*pLstVec[ipLstvec])[i] / bbGetInputk1() ;
+					(*pLstVecOut[ipLstvec]).push_back( result );				
+				} else {
+					printf("EED VectorFilterDouble::Process  Warning!! Div by 0 in Type 6 \n");
+					(*pLstVecOut[ipLstvec]).push_back( -1 );				
+				}
+			}// for size
+		} // for pLstVec		
+	} // Type==6
+
 	bbSetOutputOut0( Out0 );
 	bbSetOutputOut1( Out1 );
 	bbSetOutputOut2( Out2 );
diff --git a/packages/std/src/bbstdVectorFilterDouble.h b/packages/std/src/bbstdVectorFilterDouble.h
index 4f09e18..f3612ef 100644
--- a/packages/std/src/bbstdVectorFilterDouble.h
+++ b/packages/std/src/bbstdVectorFilterDouble.h
@@ -52,8 +52,8 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(VectorFilterDouble,bbtk::AtomicBlackBox);
   BBTK_AUTHOR("InfoDev");
   BBTK_DESCRIPTION("No Description.");
   BBTK_CATEGORY("empty");
-  BBTK_INPUT(VectorFilterDouble,Type,"default (0)  0=Erase duplicated lines, 1=Redimention Vectors, 2=Insert intermediat points,3=Adition 4=Substraction ",int,"");
-  BBTK_INPUT(VectorFilterDouble,k1,"default (0)  nothing (Type0), k1=new size vectors (Type 1) , nothing (Type2), k1 = Addition const. (Type 3), k1 = Substraction const. (Type 4) , ",double,"");
+  BBTK_INPUT(VectorFilterDouble,Type,"default (0)  0=Erase duplicated lines, 1=Redimention Vectors, 2=Insert intermediat points,3=Adition, 4=Substraction, 5=Multilication, 6=Division ",int,"");
+  BBTK_INPUT(VectorFilterDouble,k1,"default (0)  nothing (Type0), k1=new size vectors (Type 1) , nothing (Type2), k1 = Addition const. (Type 3), k1 = Substraction const. (Type 4), k1 = Multiplication const. (Type 5) , k1 = Division const. (Type 6) ,  ",double,"");
   BBTK_INPUT(VectorFilterDouble,In0,"Input vector",std::vector<double>,"");
   BBTK_INPUT(VectorFilterDouble,In1,"Input vector",std::vector<double>,"");
   BBTK_INPUT(VectorFilterDouble,In2,"Input vector",std::vector<double>,"");