X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FAutoControlPoints.cxx;h=aa1244594945258dc12406b3a55ca267a36f3d5e;hb=21c2226cf3dcad1daf3fb04818583b559694fa81;hp=034ebc3bc201f81ee468271b070792cb2502b183;hpb=8e7ab74a199d1f05b01dccfb75da7f2c4754ddc5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
index 034ebc3..aa12445 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
@@ -297,7 +297,7 @@ void AutoControlPoints::InterCircle(std::vector<double>*InX, std::vector<double>
 	//FIND THE INTERSECTIONS BETWEEN THE CIRCLE AND THE CONTOUR
 	int j,jj;
 	bool interRad = false;
-	double m1, /*mn=0,*/ m2,xinter,yinter,xmin,ymin,min,dist;
+	double m1, /*mn=0,*/ m2,xinter,yinter,xmin,ymin,min,dist; // JPRx
 	_intercircleX.clear();
 	_intercircleY.clear();
 	_intercircleDist.clear();
@@ -847,16 +847,16 @@ void AutoControlPoints::AddControlPoint(bool activate)
 {
 	if(_errorpos != -1)
 	{
-		double xmax = _interpointsX[_errorpos];
-		double ymax = _interpointsY[_errorpos];
-		double xx	= _intervectorX[_errorpos].get_var();
-		double yy	= _intervectorY[_errorpos].get_var();
+		double xmax = _interpointsX[(int)_errorpos];
+		double ymax = _interpointsY[(int)_errorpos];
+		double xx	= _intervectorX[(int)_errorpos].get_var();
+		double yy	= _intervectorY[(int)_errorpos].get_var();
 printf("\n XMAX = %f, YMAX = %f, XX = %f, YY = %f",xmax,ymax,xx,yy);
 
 		int i,ii,j,posA=-1,posB=-1;
 		bool findA=false, findB=false;
 		//CASE A
-		for(i=_errorpos; findA!=true; i++)
+		for(i=(int)_errorpos; findA!=true; i++)
 		{
 			ii = i%_errorvector.size();
 			for(j=0; j<_controlpointsX.size(); j++)
@@ -870,7 +870,7 @@ printf("\n XMAX = %f, YMAX = %f, XX = %f, YY = %f",xmax,ymax,xx,yy);
 			}
 		}
 		//CASE B
-		for(i=_errorpos; findB!=true; i--)
+		for(i=(int)_errorpos; findB!=true; i--)
 		{
 			if(_errorpos==-1)
 			{
@@ -893,7 +893,7 @@ printf("\n XMAX = %f, YMAX = %f, XX = %f, YY = %f",xmax,ymax,xx,yy);
 		if(posA<posB)
 		{
 			posA = posB+1;
-			if(posB = _controlpointsX.size()-1)
+			if(posB = _controlpointsX.size()-1)  // ?!? // JPRx
 			{
 				posA = 0;
 			}
@@ -1063,7 +1063,7 @@ void AutoControlPoints::PossibleIntersections( std::vector<double>*InX, std::vec
 	tempX.clear();
 	tempY.clear();
 	int i,j,k;
-	//double dist1,dist2;
+	//double dist1,dist2; // JPRx
 //EED 22 Sep 2008
 //	FILE *fd;
 /*
@@ -1301,7 +1301,7 @@ for(i=0; i<_controlpointsX.size(); i++)
 	PossibleIntersections(InX,InY,InZ);
 	IntersectionPoints();
 	ErrorBetweenContours();
-	//double promIn = vf->promVector(&_errorvector,false);
+	//double promIn = vf->promVector(&_errorvector,false); // JPRx
 
 	std::vector<double> tempX;
 	std::vector<double> tempY;
@@ -1342,8 +1342,8 @@ for(i=0; i<_controlpointsX.size(); i++)
 	double promactual;
 	
 	int posact;
-	//int pos1;
-	//double prom1final;
+	//int pos1; // JPRx
+	//double prom1final; // JPRx
 	int pos2;
 	double prom2final;