#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / Contour / AutoControlPoints.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
index 95e0f68985b045a44bbcf21e503108fe6f493974..88a8a7a1fde85658b6692c414cf5e4f7b73ed8da 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
@@ -268,17 +268,17 @@ void AutoControlPoints::CirclePoints(double cx, double cy, double r, double grad
                spc[2]=1;
                _pathsize = _mContourModel->GetPathSize( spc );
 
-
 //printf("\nPATH SIZE = %f",_pathsize);
-
-                std::ofstream file1;
-               file1.open( "4_SplinePoints.txt" );
-
-               for(int i = 0; i < numspline; i++){
-                       file1<<"X= "<<_chargecontrolpointsX[i] << "\tY= "<<_chargecontrolpointsY[i] << "\tZ= "<<_chargecontrolpointsZ[i]<<std::endl;
-               }
-               file1.close();
-        }
+//EED 2020-03-31
+//             std::ofstream file1;
+//             file1.open( "4_SplinePoints.txt" );
+//             for(int i = 0; i < numspline; i++)
+//             {
+//                     file1<<"X= "<<_chargecontrolpointsX[i] << "\tY= "<<_chargecontrolpointsY[i] << "\tZ= "<<_chargecontrolpointsZ[i]<<std::endl;
+//             } // for i
+//             file1.close();
+
+        } // if size
        
  }
  //Given the coordinates of two points, it calculates the slope
@@ -486,15 +486,15 @@ JCP 26-09-2008*/
 
        //DELETE!!
 
-       std::ofstream file1;
-    file1.open( "1_Intersection.txt" );
-
-       for(int i = 0; i < (int)(_intercircleX.size()); i++){
-               file1<<"X= "<<_intercircleX[i] << "\tY= "<<_intercircleY[i] << "\tDist= "<<_intercircleDist[i]<<std::endl;
-       }
-       file1.close();
+//EED 2020-03-31
+//     std::ofstream file1;
+//    file1.open( "1_Intersection.txt" );
+//     for(int i = 0; i < (int)(_intercircleX.size()); i++)
+//  {
+//             file1<<"X= "<<_intercircleX[i] << "\tY= "<<_intercircleY[i] << "\tDist= "<<_intercircleDist[i]<<std::endl;
+//     } // for i
+//     file1.close();
                
-
        delete vecf;
 }
 //-----------------------------------------------------------------------------------------------------------------------------------------
@@ -569,15 +569,17 @@ void AutoControlPoints::maxminLocal()
        }
        vecf->copyVector(&tempZ,&_controlpointsZ);
 
-//JCP 26-09-08 
-       std::ofstream file1;
-    file1.open( "2_MaxMin.txt" );
+//EED 2020-03-31
+////JCP 26-09-08       
+//     std::ofstream file1;
+//    file1.open( "2_MaxMin.txt" );
+//     for(int i = 0; i < (int)(_controlpointsX.size()); i++)
+//  {
+//             file1<<"X= "<<_controlpointsX[i] << "\tY= "<<_controlpointsY[i] << "\tZ= "<<_controlpointsZ[i]<<std::endl;
+//     } // for i
+//     file1.close();
+////JCP 26-09-08
 
-       for(int i = 0; i < (int)(_controlpointsX.size()); i++){
-               file1<<"X= "<<_controlpointsX[i] << "\tY= "<<_controlpointsY[i] << "\tZ= "<<_controlpointsZ[i]<<std::endl;
-       }
-       file1.close();
-//JCP 26-09-08
        delete vecf;
 }
 //-----------------------------------------------------------------------------------------------------------------------------------------
@@ -616,13 +618,14 @@ void AutoControlPoints::fixBetweenPoints(double val)
                vecf->copyVector(&tempY,&_controlpointsY);
                vecf->copyVector(&tempZ,&_controlpointsZ);
 
-               std::ofstream file1;
-               file1.open( "3_PointsFixed.txt" );
-
-               for(int i = 0; i < (int)(_controlpointsX.size()); i++){
-                       file1<<"X= "<<_controlpointsX[i] << "\tY= "<<_controlpointsY[i] << "\tZ= "<<_controlpointsZ[i]<<std::endl;
-               }
-               file1.close();
+//EED 2020-03-31
+//             std::ofstream file1;
+//             file1.open( "3_PointsFixed.txt" );
+//             for(int i = 0; i < (int)(_controlpointsX.size()); i++)
+//             {
+//                     file1<<"X= "<<_controlpointsX[i] << "\tY= "<<_controlpointsY[i] << "\tZ= "<<_controlpointsZ[i]<<std::endl;
+//             } // for  i
+//             file1.close();
 
                delete vecf;
        }
@@ -1309,13 +1312,11 @@ void AutoControlPoints::NearMaxError2Control()
                        nearp = distA;
                        _posn = _posA;
 
-               }
-               else
-               {
+               } else {
                        nearp = distB;
                        _posn = _posB;
-               }
-       }
+               } // if dist
+       } // if interpointsX
 }
 //-----------------------------------------------------------------------------------------------------------------------------------------
 void AutoControlPoints::MoveControlPointInContour(std::vector<double>*InX, std::vector<double>*InY, std::vector<double>*InZ)
@@ -1358,14 +1359,12 @@ for(i=0; i<_controlpointsX.size(); i++)
                        _controlpointsX.push_back( (*InX)[_contIncontpos[_posn]] );
                        _controlpointsY.push_back( (*InY)[_contIncontpos[_posn]] );
                        _controlpointsZ.push_back( (*InZ)[_contIncontpos[_posn]] );
-               }
-               else
-               {
+               } else {
                        _controlpointsX.push_back( tempX[i] );
                        _controlpointsY.push_back( tempY[i] );
                        _controlpointsZ.push_back( tempZ[i] );
-               }
-       }
+               } // if i
+       } // for
 
        fixBetweenPoints(5.0);
        PossibleIntersections(InX,InY,InZ);
@@ -1399,14 +1398,12 @@ for(i=0; i<_controlpointsX.size(); i++)
                                _controlpointsX.push_back( (*InX)[_contIncontpos[posact]] );
                                _controlpointsY.push_back( (*InY)[_contIncontpos[posact]] );
                                _controlpointsZ.push_back( (*InZ)[_contIncontpos[posact]] );
-                       }
-                       else
-                       {
+                       } else {
                                _controlpointsX.push_back( tempX[i] );
                                _controlpointsY.push_back( tempY[i] );
                                _controlpointsZ.push_back( tempZ[i] );
-                       }
-               }
+                       } // if i
+               } // for i
                if(direction == 1)
                {
                        posact = posact+1;
@@ -1502,8 +1499,8 @@ double AutoControlPoints::MoveAndAverage(int dir, std::vector<double>*InX, std::
                                ErrorBetweenContours();
                                promactual1 = vf->promVector(&_errorvector,false);
                                j--;
-                       }
-               }
+                       } // if j
+               }// for i
                delete vf;
        }
        return 99999;
@@ -1581,6 +1578,7 @@ printf("\n");
                int inicontrolpoints = cpX.size();
                double inipercentage = (inicontrolpoints*100)/InX->size();
                int h=0;
+
                if(inicontrolpoints<10)
                {
                        int points = (int)((inipercentage*3*InX->size())/100);
@@ -1592,9 +1590,10 @@ printf("\n");
                                        _controlpointsY.push_back( (*InY)[i] );
                                        _controlpointsZ.push_back( (*InZ)[i] );
                                        h = 0;
-                               }
-                       }
-               }
+                               } // if h
+                       } // for i
+               } // if initontrolpoints
+
                if(inicontrolpoints>=10)
                {
                        int points = (int)((inipercentage*2*InX->size())/100);
@@ -1606,9 +1605,9 @@ printf("\n");
                                        _controlpointsY.push_back( (*InY)[i] );
                                        _controlpointsZ.push_back( (*InZ)[i] );
                                        h = 0;
-                               }
-                       }
-               }
+                               } // if h
+                       } // for int i
+               } // if inicontrolpoints
        }
 /*
        fixBetweenPoints(5.0);
@@ -1715,7 +1714,6 @@ void AutoControlPoints::CalculeControlPoints(std::vector<double>*InX, std::vecto
 //-----------------------------------------------------------------------------------------------------------------------------------------
 void AutoControlPoints::CalculeInitialControlPoints(std::vector<double>*InX, std::vector<double>*InY, std::vector<double>*InZ)
 {
-
        _controlpointsX.clear();
        _controlpointsY.clear();
        _controlpointsZ.clear();