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=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=8cc853cb0b28244b5806e3ce307a42528d60d980;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;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 8cc853c..0006b13 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -151,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;
@@ -164,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)
@@ -177,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());
@@ -192,6 +222,7 @@ void manualViewContour::RefreshText()  // virtual
 		}
 
 		_textActor->SetInput(resultText);
+		_textActor2->SetInput(resultText2);
 		
 		if (size>=1){
 
@@ -217,6 +248,7 @@ void manualViewContour::RefreshText()  // virtual
 			py=py*_spc[1];
 
 			_textActor->SetPosition(px+GetRange()+1,py);
+			_textActor2->SetPosition(px+GetRange()+1,py+2);
 		}
 	}
 }