From abcfa5f4650c9560a593642b22310b8d24c22e88 Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 17 May 2021 09:44:19 +0200
Subject: [PATCH] #3463 box ManualContourModel optimisation of SIN()
 distribution by contour

---
 .../bbcreaMaracasVisuManualContourModel_Box.cxx    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
index b7cea8e..d887bdf 100644
--- a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
@@ -211,10 +211,8 @@ void ManualContourModel_Box::PutPointsInContour(std::vector<double> *lstTmpX,
 			if(SizeContour==(*lstTmpX).size() )
 			{
 				int iSize=0;
-printf("\n ManualContourModel_Box::PutPointsInContour y=%f\n", (*lstTmpY)[0] );
 				for ( i=iGeneral ; i<iGeneralPlusSize ; i++ )
 				{
-printf("x=%f  %f   y=%f %f  z=%f %f\n", (*lstOutX)[i], (*lstTmpX)[iSize],(*lstOutY)[i], (*lstTmpY)[iSize],(*lstOutZ)[i], (*lstTmpZ)[iSize]  );
 					(*lstOutX)[i] = (*lstTmpX)[iSize] ;
 					(*lstOutY)[i] = (*lstTmpY)[iSize] ;
 					(*lstOutZ)[i] = (*lstTmpZ)[iSize] ;
@@ -250,6 +248,8 @@ void ManualContourModel_Box::Redistribution_SIN(	double alpha,
 	std::vector<double> lstRstZ;
 	int 	ii,iGeneral;
 	int 	size,iGeneralPlusSize;
+	int	 	iGeneralPlusSizeMoisUn;
+	int	 	iGeneralPlusSizeMoisDeux;
 	int 	i,k;
 	int 	firstK;
 	double 	iiByDelta;
@@ -262,9 +262,10 @@ void ManualContourModel_Box::Redistribution_SIN(	double alpha,
 	PI			= 3.14159265;
 	TwoPI		= 2*PI;
 	iGeneral 	= 0;
-
 	size = (*lstC1X).size();
 	iGeneralPlusSize	= iGeneral+size;
+	iGeneralPlusSizeMoisUn 		= iGeneralPlusSize-1;
+	iGeneralPlusSizeMoisDeux 	= iGeneralPlusSize-2;
 	if (size>2)
 	{
 		firstK	= 0;			
@@ -275,12 +276,11 @@ void ManualContourModel_Box::Redistribution_SIN(	double alpha,
 
 			t		= ((double)ii) / ((double)(size-1));
 			tt 		= t + 0.70710678182*sin(t*TwoPI)*beta + alpha;
-			if (tt>=1) { tt=tt-1; }
+			if (tt>1) { tt=tt-1; }
 			if (tt<0) { tt=tt+1; }
 			iiByDelta = tt * dist;
 
-
-			for (k=iGeneral; k<iGeneralPlusSize-1;k++)  		 	// Search inside
+			for ( k=iGeneral ; k<iGeneralPlusSizeMoisUn ; k++ )  		 	// Search inside
 			{
 				dx 		= (*lstC1X)[k+1]-(*lstC1X)[k];
 				dy 		= (*lstC1Y)[k+1]-(*lstC1Y)[k];
@@ -300,7 +300,7 @@ void ManualContourModel_Box::Redistribution_SIN(	double alpha,
 					if (ii==0) { firstK=k; }
 					k = iGeneralPlusSize-1;
 				} else {
-					if ( k==iGeneralPlusSize-1-1 )
+					if ( k==iGeneralPlusSizeMoisDeux )
 					{
 						dd = 1;
 						lstRstX.push_back( (*lstC1X)[k] + dd*dx );
-- 
2.45.1