From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Thu, 20 May 2021 06:19:06 +0000 (+0200)
Subject: #3463 box ManualContourModel optimisation of SIN() distribution by contour
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b73754097df8a9322acd19582168c968c6850e49;p=creaMaracasVisu.git

#3463 box ManualContourModel optimisation of SIN() distribution by contour
---

diff --git a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
index d887bdf..a46ca99 100644
--- a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
@@ -550,7 +550,7 @@ void ManualContourModel_Box::RedistributionPointsAllContours_SIN(	std::vector<do
 		} else {
 			sizeContour3=-1;
 		}
-		if ( (sizeContour1>sizeContour2) && (sizeContour2>sizeContour3) )
+		if ( (sizeContour1>=sizeContour2) && (sizeContour2>sizeContour3) )
 		{
 			findAlphaBetaSinDistribution( &lstTmp2X,&lstTmp2Y,&lstTmp2Z ,sizeContour2,  &lstTmp1X,&lstTmp1Y,&lstTmp1Z,  &alpha,&beta);
 			Redistribution_SIN( alpha,beta, &lstTmp2X,&lstTmp2Y,&lstTmp2Z ,sizeContour2, &lstTmp2aX,&lstTmp2aY,&lstTmp2aZ );
@@ -559,11 +559,7 @@ void ManualContourModel_Box::RedistributionPointsAllContours_SIN(	std::vector<do
 			PutPointsInContour(&lstTmp2aX,&lstTmp2aY,&lstTmp2aZ, iContour+1 ,lstOutX,lstOutY,lstOutZ,lstIndexsOut);				
 			CopyContour2InContour1( &lstTmp2aX,&lstTmp2aY,&lstTmp2aZ , &lstTmp1X,&lstTmp1Y,&lstTmp1Z );
 		} else {
-			if ( (sizeContour1>sizeContour2) && (sizeContour2<sizeContour3) )  // Warning for a minimum local
-		 	{
-		 		lstContourExeption.push_back( iContour-1 );
-		 	} // if minimum local
-			if ( (sizeContour1<sizeContour2) && (sizeContour2>sizeContour3) )  // Warning for a maximum local
+			if ( (sizeContour3!=-1) && (sizeContour1<sizeContour2) && (sizeContour2>sizeContour3) )  // Warning for a maximum local
 			{
 				lstInconsistentContourY.push_back( lstTmp2Y[0] );
 				lstInconsistentContourID.push_back( iContour+1 );
@@ -606,7 +602,7 @@ void ManualContourModel_Box::RedistributionPointsAllContours_SIN(	std::vector<do
 		 	{
 		 		lstContourExeption.push_back( iContour-1 );
 		 	} // if minimum local
-			if ( (sizeContour1<sizeContour2) && (sizeContour2>sizeContour3) )  // Warning for a maximum local
+			if ( (sizeContour3!=-1) && (sizeContour1<sizeContour2) && (sizeContour2>sizeContour3) )  // Warning for a maximum local
 			{
 				lstInconsistentContourY.push_back( lstTmp2Y[0] );
 				lstInconsistentContourID.push_back( iContour-1 );