#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
index 89566462820dd116a60f230c58123e3d9c1279f7..ad52edc9a80adb84a3791e4dc02ef7df72e1a8f8 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "ExtractControlPoints2D.h"
 
 //Construction
@@ -18,6 +43,7 @@ void ExtractControlPoints2D::ResetControlPoints()
 //-----------------------------------------------------------------------------------------
 void ExtractControlPoints2D::SetContour(std::vector<double>*InX, std::vector<double>*InY,std::vector<double>*InZ)
 {
+       int i;
        _InX.clear();
        _InY.clear();
        _InZ.clear();
@@ -26,15 +52,13 @@ void ExtractControlPoints2D::SetContour(std::vector<double>*InX, std::vector<dou
        int sizeZ = InZ->size();
        if( (sizeX == sizeY) && (sizeY==sizeZ) )
        {
-               for(int i=0; i<sizeX; i++)
+               for(i=0; i<sizeX; i++)
                {
                        _InX.push_back( (*InX)[i] );
                        _InY.push_back( (*InY)[i] );
                        _InZ.push_back( (*InZ)[i] );
-               }
-       }
-       else
-       {
+               } // for i
+       } else {
                printf("\n The lists Of vectors have diferents sizes");
        }
 }
@@ -49,7 +73,7 @@ void ExtractControlPoints2D::GetInitialControlPoints(std::vector<double>*pOutX,
 
        if(_InX.size() != 0)
        {
-               autoc->SetNumSplineInterpolation(_numinterspline);
+               autoc->SetNumSplineInterpolation((int)_numinterspline);
                autoc->CalculeInitialControlPoints(&_InX,&_InY,&_InZ);
                autoc->GetInitialControlPoints(pOutX,pOutY,pOutZ);
        }
@@ -66,7 +90,7 @@ void ExtractControlPoints2D::GetControlPoints(std::vector<double>*pOutX, std::ve
 
        if(_InX.size() != 0)
        {
-               autoc->SetNumSplineInterpolation(_numinterspline);
+               autoc->SetNumSplineInterpolation((int)_numinterspline);
                autoc->CalculeControlPoints(&_InX,&_InY,&_InZ);
                autoc->GetControlPoints(pOutX,pOutY,pOutZ);
        }
@@ -91,9 +115,9 @@ void ExtractControlPoints2D::GetSamplingControlPoints(std::vector<double>*pOutX,
        if(_InX.size() != 0)
        {
                int h = 1;
-               //int j=0;
+               //int j=0;  // JPRx
                int points = (int)(_InX.size()/_numsampling);
-               for (int i=0; i<_InX.size(); i++, h++)
+               for (int i=0; i<(int)(_InX.size()); i++, h++)
                {
                        if( h == points )
                        {