#3093 creaMaracasVisu Feature New Normal - Contour Information in pixels and image...

[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 0e14ca465fecdd1623fab43b109aac018cf11641..95e0f68985b045a44bbcf21e503108fe6f493974 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.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 "AutoControlPoints.h"
 //------------------------------------------------------------------------------------------------------------------------------------------
 //CLASS: AutoControlPoints -----------------------------------------------------------------------------------------------------------------
@@ -234,7 +259,16 @@ void AutoControlPoints::CirclePoints(double cx, double cy, double r, double grad
                        _chargecontrolpointsY.push_back(y);
                        _chargecontrolpointsZ.push_back(z);
                }
-               _pathsize = _mContourModel->GetPathSize();
+
+// EED 2017-05-30
+//             _pathsize = _mContourModel->GetPathSize(  );
+               double spc[3];
+               spc[0]=1;
+               spc[1]=1;
+               spc[2]=1;
+               _pathsize = _mContourModel->GetPathSize( spc );
+
+
 //printf("\nPATH SIZE = %f",_pathsize);
 
                 std::ofstream file1;
@@ -760,7 +794,7 @@ JCP 30-08-09 */
                        {
                                //TYPE: LE PLUS PRES VOISIN
                                dist  = sqrt( pow( _intervectorX[i].get_vec(j)-_interpointsX[i-1],2 ) + pow( _intervectorY[i].get_vec(j)-_interpointsY[i-1],2 ) );
-                               //TYPE: LE PLUS PRES DANS LA MÊME DROITE
+                               //TYPE: LE PLUS PRES DANS LA M�ME DROITE
                                //dist = sqrt(pow(_intervectorX[i].get_vec(j)-_intervectorX[i].get_var(),2)+pow(_intervectorY[i].get_vec(j)-_intervectorY[i].get_var(),2));
                                
                                if( dist < min )