X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewContour.cpp;h=309a4ceb41d60ced00fce985f919e69f21fcd6b6;hb=8e51f74bc77447daf61b8e1caf7ab07ae235b578;hp=f35e2311f4a218b7d2c202f34e357b2f8a3d051a;hpb=885faee171b5cdcbcbbcb6cc83e6d196544e005c;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 f35e231..309a4ce 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -109,11 +109,22 @@ void manualViewContour::RefreshText()  // virtual
 		char text[50];
 		char resultText[50];
 		strcpy(resultText," ");
+
+//CMRU 19-08-09 ----------------------------------
+		std::string label;
+		label = _manContModel->GetLabel();
+// ------------------------------------
+
 		if (size==2)
 		{
 			strcpy(resultText,"L= ");
 			gcvt ( _mesureScale * this->_manContModel->GetPathSize() , 5, text );
 			strcat(resultText,text);
+
+//CMRU 19-08-09 ----------------------------------
+			strcat(resultText," ");
+			strcat(resultText,label.c_str());
+//------------------------------------------------
 		}
 		if (size>2)
 		{
@@ -130,6 +141,9 @@ void manualViewContour::RefreshText()  // virtual
 				gcvt (  _mesureScale * this->_manContModel->GetPathSize() , 5, text );
 				strcat(resultText,text);
 			}
+//CMRU 19-08-09 ----------------------------------
+			strcat(resultText,label.c_str());
+//------------------------------------------------
 		}
 
 		_textActor->SetInput(resultText);
@@ -145,9 +159,13 @@ void manualViewContour::RefreshText()  // virtual
 				}
 			}
 
-			int id = _id_viewPoint_for_text;
-			double px = _manContModel->GetManualPoint(id)->GetX();
-			double py = _manContModel->GetManualPoint(id)->GetY();
+			if (_id_viewPoint_for_text>=size) 
+			{
+				_id_viewPoint_for_text=0;
+			}
+			
+			double px = _manContModel->GetManualPoint(_id_viewPoint_for_text)->GetX();
+			double py = _manContModel->GetManualPoint(_id_viewPoint_for_text)->GetY();
 
 			//EED 27 sep 2006
 			px=px*_spc[0];