X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdVectorFilterDouble.cxx;h=63d22719334da7b6bb2062b1bef187f4811664d7;hb=fbfcf39b0f5c8b6e34cb251564df64974b656d31;hp=af17d93af7d0d81ad4dc635f8b457a476a49359d;hpb=487ff90504a4acc91210205e9dad3ee8e8ae3ad1;p=bbtk.git

diff --git a/packages/std/src/bbstdVectorFilterDouble.cxx b/packages/std/src/bbstdVectorFilterDouble.cxx
index af17d93..63d2271 100644
--- a/packages/std/src/bbstdVectorFilterDouble.cxx
+++ b/packages/std/src/bbstdVectorFilterDouble.cxx
@@ -113,7 +113,7 @@ void VectorFilterDouble::Process()
 		int		ipLstvec2;
 		double	iLine;
 		int 	sizeLines	= (*pLstVec[0]).size();
-		double 	step		= (double)sizeLines/(double)bbGetInputk1();
+		double 	step		= (double)sizeLines/((double)bbGetInputk1()-1);
 		for (iLine=0 ; iLine<sizeLines ; iLine=iLine+step)
 		{
 			for (ipLstvec2=0 ; ipLstvec2<pLstVec.size() ; ipLstvec2++)
@@ -121,6 +121,13 @@ void VectorFilterDouble::Process()
 				(*pLstVecOut[ipLstvec2]).push_back( (*pLstVec[ipLstvec2])[(int)iLine] );
 			} // for			
 		} // for ipLstVec
+
+		// adding the lastone
+		for (ipLstvec2=0 ; ipLstvec2<pLstVec.size() ; ipLstvec2++)
+		{
+			(*pLstVecOut[ipLstvec2]).push_back( (*pLstVec[ipLstvec2])[(int)(sizeLines-1)] );
+		} // for			
+
 	} // Type==1
 
 	if (bbGetInputType()==2) // Insert intermediate points
@@ -180,6 +187,136 @@ 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  k1ng gadget (node check, owner GtkCheckButton)
+
+
+	{
+		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
+
+
+
+	if (bbGetInputType()==7) 
+	{
+		int i,j;
+		for (j=0;j<In4.size(); j++)
+		{
+			Out0.push_back( In4[j] );
+			Out1.push_back( In5[j] );
+			Out2.push_back( In6[j] );
+		} //
+
+
+		int iGeneral=0,sizeI,sizeLst1Indexes=In3.size();
+		for (i=0; i<sizeLst1Indexes-1;i++) { iGeneral=iGeneral+In3[i]; }
+		sizeI=iGeneral+In3[ sizeLst1Indexes-1 ];
+
+		int jGeneral = 0;
+		int sizeJ	 = In7[ 0 ];
+
+		double dist2,dist2Min,dx,dy,dz;
+		int iBack;
+
+		for (j=jGeneral;j<sizeJ;j++) 
+		{
+			dist2Min=1000000;
+			for (i=iGeneral;i<sizeI;i++) 
+			{	
+				dx		= In0[i]-In4[j];
+				dy		= In1[i]-In5[j];
+				dz		= In2[i]-In6[j];
+				dist2		= dx*dx + dy*dy + dz*dz;
+				if (dist2<dist2Min) 
+				{
+						dist2Min=dist2;
+						iBack=i;
+				} // if
+			} // for j
+			Out0[j]=In0[iBack]; 
+			Out1[j]=In1[iBack]; 
+			Out2[j]=In2[iBack]; 
+		} // for i
+
+
+	}	// Type 7
+
+
+
+	if (bbGetInputType()==8)   // order all vectors using as base the vector In0
+	{
+printf("EED VectorFilterDouble::Process Type 8 Start\n");
+		double tmp;
+		int i,j,ii,sizeII;
+		sizeII=pLstVec.size();
+
+
+		int size=In0.size();
+		for (i=0;i<size; i++)
+		{
+			for (ii=0;ii<sizeII;ii++)
+			{
+				 (*pLstVecOut[ii]).push_back( (*pLstVec[ii])[i] ); 
+			} // for ii
+		} // i
+		for (i=0;i<size;i++)
+		{
+			for (j=i;j<size;j++)
+			{
+				if ((*pLstVecOut[0])[j] <= (*pLstVecOut[0])[i] ) 
+				{	
+					
+					for (ii=0;ii<sizeII;ii++)
+					{
+						tmp = (*pLstVecOut[ii])[i]; 
+						(*pLstVecOut[ii])[i] = (*pLstVecOut[ii])[j]; 
+						(*pLstVecOut[ii])[j] = tmp; 
+//						tmp=Out0[i]; Out0[i]=Out0[j]; Out0[j]=tmp; 
+					}
+				}
+			} // for j
+		} // for i
+printf("EED VectorFilterDouble::Process Type 8 End\n");
+
+ 	} // Type 8
+
+
+
+
 	bbSetOutputOut0( Out0 );
 	bbSetOutputOut1( Out1 );
 	bbSetOutputOut2( Out2 );