X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualContourModel.cpp;h=e5ab192a368b3d2889b255b2abbf733c2b8388de;hb=5634a5c573f547422027d38e0da591feafc3460e;hp=f8369751bf63a9c61c893790852361d8776a308e;hpb=c6481486861a91e8ead2033566097c502488670e;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
index f836975..e5ab192 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
@@ -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 "manualContourModel.h"
 
 // ----------------------------------------------------------------------------
@@ -312,7 +337,8 @@ void manualContourModel::UpdateSpline() // virtual
 		_delta_JSTG = (double) (np) / double (_sizePointsContour - 1);  //Without the -1 the curve is not close
 	} else {
 //		_delta_JSTG = (double) (np-1) / double (_sizePointsContour );  //Without the -1 the curve is not close
- 		_delta_JSTG = (double) (np) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
+//EED 9/7/2016 		_delta_JSTG = (double) (np) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
+ 		_delta_JSTG = (double) (np-1) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
 	}
 //-----------------------------------------------------------------------------------------------------------
 }
@@ -339,7 +365,7 @@ void manualContourModel::GetSpline_i_Point(int i, double *x, double *y, double *
 //JSTG 25-02-08 ---------------------------------------------------------------
 void manualContourModel::GetSpline_t_Point(double t, double *x, double *y, double *z)
 {
-		if (_lstPoints.size()==0)
+	if (_lstPoints.size()==0)
 	{
 		*x	= 0;
 		*y	= 0;
@@ -388,7 +414,7 @@ void manualContourModel::GetSpline_t_Point(double t, double *x, double *y, doubl
 	}
 }*/
 // ----------------------------------------------------------------------------
-double manualContourModel::GetPathSize()
+double manualContourModel::GetPathSize(double *spc)
 {
 	double result = 0;
 	double x1,y1,z1;
@@ -402,12 +428,12 @@ double manualContourModel::GetPathSize()
 
 	if (_lstPoints.size()==2)
 	{
-		x1=_lstPoints[0]->GetX();
-		y1=_lstPoints[0]->GetY();
-		z1=_lstPoints[0]->GetZ();
-		x2=_lstPoints[1]->GetX();
-		y2=_lstPoints[1]->GetY();
-		z2=_lstPoints[1]->GetZ();
+		x1 = spc[0] * _lstPoints[0]->GetX();
+		y1 = spc[1] * _lstPoints[0]->GetY();
+		z1 = spc[2] * _lstPoints[0]->GetZ();
+		x2 = spc[0] * _lstPoints[1]->GetX();
+		y2 = spc[1] * _lstPoints[1]->GetY();
+		z2 = spc[2] * _lstPoints[1]->GetZ();
 		result = sqrt( (x2-x1)*(x2-x1) + (y2-y1)*(y2-y1) + (z2-z1)*(z2-z1) );
 	}
 	if (_lstPoints.size()>2)
@@ -421,12 +447,18 @@ double manualContourModel::GetPathSize()
 		//GetSplinePoint(0,x1,y1,z1);
 		GetSpline_i_Point(0,&x1,&y1,&z1);
 
+		x1 = spc[0] * x1; 
+		y1 = spc[1] * y1; 
+		z1 = spc[2] * z1; 
 		//for( i = 1; i < nps; i++ )
 		for( i = 1; i < GetNumberOfPointsSpline(); i++ )
 		{
 			//t = delta * (double)i;
 			//GetSplinePoint(t,x2,y2,z2);
 			GetSpline_i_Point(i,&x2,&y2,&z2);
+			x2 = spc[0] * x2; 
+			y2 = spc[1] * y2; 
+			z2 = spc[2] * z2; 
 //---------------------------------------------------------
 			result=result + sqrt( (x2-x1)*(x2-x1) + (y2-y1)*(y2-y1) + (z2-z1)*(z2-z1) );
 			x1=x2;
@@ -437,8 +469,10 @@ double manualContourModel::GetPathSize()
 
 	return result;
 }
+
+
 // ----------------------------------------------------------------------------
-double manualContourModel::GetPathArea()
+double manualContourModel::GetPathArea(double *spc)
 {
 	double result = 555;
 	if ((_lstPoints.size()>=3) && IfCloseContour()==true )
@@ -473,6 +507,12 @@ double manualContourModel::GetPathArea()
 			GetSpline_i_Point(i,&x1,&y1,&z1);
 			GetSpline_i_Point(j,&x2,&y2,&z2);
 //----------------------------------------------------------------
+			x1=spc[0]*x1;
+			y1=spc[1]*y1;
+			z1=spc[2]*z1;
+			x2=spc[0]*x2;
+			y2=spc[1]*y2;
+			z2=spc[2]*z2;
 			area +=
 					(x1 * y2 ) -
 					( x2 * y1 );
@@ -582,9 +622,7 @@ void manualContourModel::GetNearestPointAndNormal(double *p, double *rp,  double
 			rn[1]=rp[1]-y1;
 			rn[2]=rp[2]-z1;
 		}
-	}
-	else
-	{
+	} else {
 		rp[0] = 0;
 		rp[1] = 0;
 		rp[2] = 0;