X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FAutoControlPoints.cxx;h=35936e10d1683b3bedefa39c0dce8fbdacc5f2ea;hb=885faee171b5cdcbcbbcb6cc83e6d196544e005c;hp=1e497c9ccd725692e5a8a60745a72a5612d7cf42;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx index 1e497c9..35936e1 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*InX, std::vector //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(); @@ -315,14 +315,14 @@ void AutoControlPoints::InterCircle(std::vector*InX, std::vector //std::ofstream file1; //file1.open( "Temp.txt" ); - for(i=0; isize(); j++) + for(j=0; j<(int)(InX->size()); j++) { jj = (j+1)%(InX->size()); m2 = Slope((*InX)[j],(*InY)[j],(*InX)[jj],(*InY)[jj]);//Slope of the vector between the adjacent points @@ -433,7 +433,7 @@ JCP 26-09-2008*/ tempDD.push_back(_interbewteencircleDist[i]); // fprintf(fdata,"\n%f %f %f",_interbewteencircleDist[j],_interbewteencircleX[j],_interbewteencircleY[j]); } - for(i=_interbewteencirclePos[0]; i<_intercircleX.size(); i++) + for(i=_interbewteencirclePos[0]; i<(int)(_intercircleX.size()); i++) { tempXX.push_back(_intercircleX[i]); tempYY.push_back(_intercircleY[i]); @@ -455,7 +455,7 @@ JCP 26-09-2008*/ std::ofstream file1; file1.open( "1_Intersection.txt" ); - for(int i = 0; i < _intercircleX.size(); i++){ + for(int i = 0; i < (int)(_intercircleX.size()); i++){ file1<<"X= "<<_intercircleX[i] << "\tY= "<<_intercircleY[i] << "\tDist= "<<_intercircleDist[i]<copyVector(&_minlocalX,&_controlpointsX); vecf->copyVector(&_minlocalY,&_controlpointsY); - for(i=0; i<_minlocalX.size(); i++) + for(i=0; i<(int)(_minlocalX.size()); i++) { tempZ.push_back(_controlpointsZ[0]); } @@ -539,7 +539,7 @@ void AutoControlPoints::maxminLocal() std::ofstream file1; file1.open( "2_MaxMin.txt" ); - for(int i = 0; i < _controlpointsX.size(); i++){ + for(int i = 0; i < (int)(_controlpointsX.size()); i++){ file1<<"X= "<<_controlpointsX[i] << "\tY= "<<_controlpointsY[i] << "\tZ= "<<_controlpointsZ[i]<*InX, std::vecto vecX->set_var(_chargecontrolpointsX[i]); vecY->set_var(_chargecontrolpointsY[i]); - for(j=0; jsize(); j++) + for(j=0; j<(int)(InX->size()); j++) { jj = (j+1)%(InX->size()); m2 = Slope((*InX)[j],(*InY)[j],(*InX)[jj],(*InY)[jj]); @@ -737,7 +737,7 @@ void AutoControlPoints::IntersectionPoints() printf("\n\n There is an invalid intersection: Must see AutoControlPoints::IntersectionPoints() method"); } JCP 30-08-09 */ - for(i=0; i<_intervectorX.size(); i++){ + for(i=0; i<(int)(_intervectorX.size()); i++){ min = 9999; posj = -1; for(j=0; j<_intervectorX[i].getsize_vec(); j++) { @@ -814,14 +814,14 @@ void AutoControlPoints::ErrorBetweenContours() // FILE *fd; // fd = fopen("C:/bbtk_JS/data/interErrorData.txt","w"); - for(i=0; i<_interpointsX.size(); i++) + for(i=0; i<(int)(_interpointsX.size()); i++) { _errorvector.push_back( (sqrt( pow( _interpointsX[i]-_intervectorX[i].get_var(),2 ) + pow( _interpointsY[i]-_intervectorY[i].get_var(),2 ) )/_pathsize)*100 ); // fprintf(fd,"\n%d %f",i,_errorvector[i]); } // fclose(fd); double max = -1; - for(i=0; i<_errorvector.size(); i++) + for(i=0; i<(int)(_errorvector.size()); i++) { if(_interpointsX[i] != -1) { @@ -847,19 +847,19 @@ 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++) + for(j=0; j<(int)(_controlpointsX.size()); j++) { if( ((float)_controlpointsX[j]-1.5<=(float)_intervectorX[ii].get_var()) && ((float)_intervectorX[ii].get_var()<=(float)_controlpointsX[j]+1.5) && ((float)_controlpointsY[j]-1.5<=(float)_intervectorY[ii].get_var()) && ((float)_intervectorY[ii].get_var()<=(float)_controlpointsY[j]+1.5) ) @@ -870,13 +870,13 @@ 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) { i = _errorvector.size(); } - for(j=0; j<_controlpointsX.size(); j++) + for(j=0; j<(int)(_controlpointsX.size()); j++) { if( ((float)_controlpointsX[j]-1.5<=(float)_intervectorX[i].get_var()) && ((float)_intervectorX[i].get_var()<=(float)_controlpointsX[j]+1.5) && ((float)_controlpointsY[j]-1.5<=(float)_intervectorY[i].get_var()) && ((float)_intervectorY[i].get_var()<=(float)_controlpointsY[j]+1.5) ) @@ -893,7 +893,7 @@ printf("\n XMAX = %f, YMAX = %f, XX = %f, YY = %f",xmax,ymax,xx,yy); if(posA tempX; std::vector tempY; std::vector tempZ; - for(i=0; i<_controlpointsX.size(); i++) + for(i=0; i<(int)(_controlpointsX.size()); i++) { if(i == id) { @@ -952,7 +952,7 @@ void AutoControlPoints::InterBetweenControl( ) // FILE *fd; // fd = fopen("C:/bbtk_JS/data/InterBetweenControl.txt","w"); - for(i=0; i<_chargecontrolpointsX.size()-1; i++) + for(i=0; i<(int)(_chargecontrolpointsX.size())-1; i++) { ii = (i+1)%(_chargecontrolpointsX.size()); m1 = Slope(_chargecontrolpointsX[i],_chargecontrolpointsY[i],_chargecontrolpointsX[ii],_chargecontrolpointsY[ii]); @@ -965,7 +965,7 @@ void AutoControlPoints::InterBetweenControl( ) vecX->set_var(_chargecontrolpointsX[i]); vecY->set_var(_chargecontrolpointsY[i]); - for(j=0; j<_chargecontrolpointsX.size(); j++) + for(j=0; j<(int)(_chargecontrolpointsX.size()); j++) { jj = (j+1)%(_chargecontrolpointsX.size()); m2 = Slope(_chargecontrolpointsX[j],_chargecontrolpointsY[j],_chargecontrolpointsX[jj],_chargecontrolpointsY[jj]); @@ -1021,7 +1021,7 @@ void AutoControlPoints::fixBetweenControl() float vecx,vecy,varx,vary; // FILE *fd; // fd = fopen("C:/bbtk_JS/data/InterBetweenControlFix.txt","w"); - for(i=0; i<_intervecXX.size(); i++) + for(i=0; i<(int)(_intervecXX.size()); i++) { Vector *vx = new Vector(); Vector *vy = new Vector(); @@ -1063,7 +1063,7 @@ void AutoControlPoints::PossibleIntersections( std::vector*InX, std::vec tempX.clear(); tempY.clear(); int i,j,k; - double dist1,dist2; + //double dist1,dist2; // JPRx //EED 22 Sep 2008 // FILE *fd; /* @@ -1119,7 +1119,7 @@ void AutoControlPoints::PossibleIntersections( std::vector*InX, std::vec if(_intervectorX.size() != 0) { // fd = fopen("C:/bbtk_JS/data/InterPossibleIntersections.txt","w"); - for(i=0; i<_intervectorX.size(); i++) + for(i=0; i<(int)(_intervectorX.size()); i++) { // fprintf(fd,"\n Para X = %f, Y = %f",_intervectorX[i].get_var(),_intervectorY[i].get_var()); if(_intervectorX[i].getsize_vec() > 1) @@ -1136,7 +1136,7 @@ void AutoControlPoints::PossibleIntersections( std::vector*InX, std::vec ity = arrY.begin(); itxx = arrX.begin()+1; ityy = arrY.begin()+1; - for(j=0; j _intervectorX[i].get_var()) && (*ity < _intervectorY[i].get_var()) && @@ -1225,7 +1225,7 @@ void AutoControlPoints::PossibleIntersections( std::vector*InX, std::vec _intervectorX[i].resetVec(); _intervectorY[i].resetVec(); //printf("\n _intervector(%d) Size = %d",i,_intervectorX[i].getsize_vec()); - for(k=0; k x_int = %f, y_int = %f",arrX[k],arrY[k]); @@ -1247,10 +1247,10 @@ void AutoControlPoints::ControlInContour(std::vector*InX, std::vectorsize()) && (find!=true); j++) + for(j=0; (j<(int)(InX->size())) && (find!=true); j++) { if( ((*InX)[j]-range<=_controlpointsX[i]) && (_controlpointsX[i]<=(*InX)[j]+range) && ((*InY)[j]-range<=_controlpointsY[i]) && (_controlpointsY[i]<=(*InY)[j]+range) ) { @@ -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 tempX; std::vector tempY; @@ -1317,7 +1317,7 @@ for(i=0; i<_controlpointsX.size(); i++) _controlpointsY.clear(); _controlpointsZ.clear(); - for(i=0; i prom; i++) { prom = promactual; - for(i=0; i*InX, std:: tempY.clear(); vf->copyVector(&_controlpointsX,&tempX); vf->copyVector(&_controlpointsY,&tempY); - int i,j,pos = 0; + int i,j /*,pos = 0*/ ; // JPRx double prom1=0,promactual1=1; - double prom2=0,promactual2=1; + //double prom2=0,promactual2=1; // JPRx int h = 0; int hh = 1; if(_contIncontpos[h]>_contIncontpos[hh]) @@ -1432,7 +1432,7 @@ double AutoControlPoints::MoveAndAverage(int dir, std::vector*InX, std:: ity = _controlpointsY.begin(); for(i=_contIncontpos[h],j=_contIncontpos[h]; (i>_contIncontpos[hh]) && (promactual1>prom1); i--) { - if(j == InX->size()) + if(j == (int)(InX->size())) { j = 0; } @@ -1503,7 +1503,7 @@ printf("\n"); _controlpointsZ.clear(); vf->copyVector(&_minmaxlocalX,&_controlpointsX); vf->copyVector(&_minmaxlocalY,&_controlpointsY); - for(int i=0; i<_minmaxlocalX.size(); i++) + for(int i=0; i<(int)(_minmaxlocalX.size()); i++) { _controlpointsZ.push_back( (*InZ)[0] ); } @@ -1550,7 +1550,7 @@ printf("\n"); if(inicontrolpoints<10) { int points = (int)((inipercentage*3*InX->size())/100); - for (int i=0; isize(); i++, h++) + for (int i=0; i<(int)(InX->size()); i++, h++) { if( h == points ) { @@ -1564,7 +1564,7 @@ printf("\n"); if(inicontrolpoints>=10) { int points = (int)((inipercentage*2*InX->size())/100); - for (int i=0; isize(); i++, h++) + for (int i=0; i<(int)(InX->size()); i++, h++) { if( h == points ) { @@ -1621,7 +1621,7 @@ void AutoControlPoints::GetInitialNewPoints(std::vector*InX, std::vector _controlpointsZ.clear(); vf->copyVector(&_minmaxlocalX,&_controlpointsX); vf->copyVector(&_minmaxlocalY,&_controlpointsY); - for(int i=0; i<_minmaxlocalX.size(); i++) + for(int i=0; i<(int)(_minmaxlocalX.size()); i++) { _controlpointsZ.push_back( (*InZ)[0] ); } @@ -1720,4 +1720,6 @@ void AutoControlPoints::SetNumSplineInterpolation(int num) } //----------------------------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------------------------- -//----------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file +//----------------------------------------------------------------------------------------------------------------------------------------- + +