X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewContour.cpp;h=0006b13e0265b3cec358d16ff652f0a7580777a1;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=bff37c326502bbce96024a57cccc56ee604f37ab;hpb=1b4ae09d7ff99ffeb0c64656122aba6266ace686;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
index bff37c3..0006b13 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.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 "manualViewContour.h"
 
 // ----------------------------------------------------------------------------
@@ -126,8 +151,10 @@ void manualViewContour::RefreshText()  // virtual
 	if ((_textActor!=NULL) && ( _textActor->GetProperty()->GetOpacity()!=0 )){
 		int size = GetNumberOfPoints();
 		char text[50];
-		char resultText[50];
+		char resultText[250];
 		strcpy(resultText, "000");
+		char resultText2[250];
+		strcpy(resultText2, "000");
 
 //CMRU 19-08-09 ----------------------------------
 		std::string label;
@@ -139,10 +166,17 @@ void manualViewContour::RefreshText()  // virtual
 			strcpy(resultText,"L= ");
 			gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
 			strcat(resultText,text);
+			strcat(resultText,"p");
 
 //CMRU 19-08-09 ----------------------------------
 			strcat(resultText," ");
 			strcat(resultText,label.c_str());
+
+			strcpy(resultText2,"L= ");
+			gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+			strcat(resultText2,text);
+			strcat(resultText2,"u");
+
 //------------------------------------------------
 		}
 		if (size>2)
@@ -152,14 +186,35 @@ void manualViewContour::RefreshText()  // virtual
 				strcpy(resultText,"P= ");
 				gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
 				strcat(resultText,text);
+				strcat(resultText,"p");
+
 				gcvt ( _mesureScale * _mesureScale * this->_manContModel->GetPathArea(), 5, text );
 				strcat(resultText,"   A= ");
 				strcat(resultText,text);
-				strcat(resultText," ");
+				strcat(resultText,"p^2 ");
+
+
+				strcpy(resultText2,"P= ");
+				gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+				strcat(resultText2,text);
+				strcat(resultText2,"u");
+
+				gcvt ( _mesureScale * _mesureScale * this->_manContModel->GetPathArea(), 5, text );
+				strcat(resultText2,"   A= ");
+				strcat(resultText2,text);
+				strcat(resultText2,"u^2 ");
+
 			} else {
 				strcpy(resultText,"L= ");
 				gcvt (  _mesureScale * this->_manContModel->GetPathSize(), 5, text );
 				strcat(resultText,text);
+				strcat(resultText,"p");
+
+				strcpy(resultText2,"L= ");
+				gcvt (  _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+				strcat(resultText2,text);
+				strcat(resultText2,"u");
+
 			}
 //CMRU 19-08-09 ----------------------------------
 			strcat(resultText,label.c_str());
@@ -167,6 +222,7 @@ void manualViewContour::RefreshText()  // virtual
 		}
 
 		_textActor->SetInput(resultText);
+		_textActor2->SetInput(resultText2);
 		
 		if (size>=1){
 
@@ -192,6 +248,7 @@ void manualViewContour::RefreshText()  // virtual
 			py=py*_spc[1];
 
 			_textActor->SetPosition(px+GetRange()+1,py);
+			_textActor2->SetPosition(px+GetRange()+1,py+2);
 		}
 	}
 }
@@ -225,11 +282,10 @@ bool manualViewContour::ifTouchContour(int x,int y,int z)
 		nps_t = nps-1;
 		} // if close
 
-		printf("EED  manualViewContour::ifTouchContour \n");
+printf("EED  Warning manualViewContour::ifTouchContour \n");
 
 		for( i = 0; i < nps_t; i++ ) 
 		{
-printf("%d ", i);
 			_pts->GetPoint(i%nps, ppA);
 			_pts->GetPoint((i+1)%nps, ppB);
 			d1 = sqrt( (ppA[0]-xx)*(ppA[0]-xx) + (ppA[1]-yy)*(ppA[1]-yy) + (ppA[2]-zz)*(ppA[2]-zz));