*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualContour / manualViewContour.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
index c5b00f74e1b9fb1555731980bda32993cd7d6e26..0c2037dab13fd573d4e497fd1949a9670370e8c7 100644 (file)
--- 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)
                {
@@ -125,11 +136,15 @@ void manualViewContour::RefreshText()  // virtual
                                gcvt ( _mesureScale * _mesureScale * this->_manContModel->GetPathArea() , 5, text );
                                strcat(resultText,"   A= ");
                                strcat(resultText,text);
+                               strcat(resultText," ");
                        } else {
                                strcpy(resultText,"L= ");
                                gcvt (  _mesureScale * this->_manContModel->GetPathSize() , 5, text );
                                strcat(resultText,text);
                        }
+//CMRU 19-08-09 ----------------------------------
+                       strcat(resultText,label.c_str());
+//------------------------------------------------
                }
 
                _textActor->SetInput(resultText);
@@ -145,9 +160,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];
@@ -168,7 +187,7 @@ bool manualViewContour::ifTouchContour(int x,int y,int z){
        double ppA[3];
        double ppB[3];
        double d1,d2,d3;
-       TransfromeCoordViewWorld(xx,yy,zz);
+       TransfromCoordViewWorld(xx,yy,zz);
 
 //EED 27 sep 2006
        xx = xx * _spc[0];
@@ -234,7 +253,7 @@ void manualViewContour::InitMove(int x, int y, int z)
        double XX=x;
        double YY=y;
        double ZZ=z;
-       TransfromeCoordViewWorld(XX,YY,ZZ);
+       TransfromCoordViewWorld(XX,YY,ZZ);
 
        int i, manualPointsSZ = _manContModel->GetSizeLstPoints();
        for ( i=0; i<manualPointsSZ; i++ )
@@ -252,7 +271,7 @@ void manualViewContour::MoveContour(int x, int y, int z)
        double YY=y;
        double ZZ=z;
 
-       TransfromeCoordViewWorld(XX,YY,ZZ);
+       TransfromCoordViewWorld(XX,YY,ZZ);
 
        int i, manualPointsSZ = _manContModel->GetSizeLstPoints();
        for ( i=0; i<manualPointsSZ; i++ )