DFCH: imageUndoRedo + Manual Paint: It doesn't works :s :s

[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 309a4ceb41d60ced00fce985f919e69f21fcd6b6..4fee4987fa2750e887e9c64ec022169e0a53f931 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -7,7 +7,7 @@
 manualViewContour::manualViewContour()
 {
        _id_viewPoint_for_text  =       0;
-       _mesureScale                    =       1;
+       _mesureScale            =       1;
        _initialConoturModel = new manualContourModel();
 }
 // ----------------------------------------------------------------------------
@@ -55,12 +55,9 @@ void manualViewContour::Open(FILE *pFile)
 {
 }
 
-
-
 // ----------------------------------------------------------------------------
 void manualViewContour::RefreshContour() // virtual
 {
-
        int i,np,nps;
 
 //JSTG 25-02-08 --------------------
@@ -88,8 +85,7 @@ void manualViewContour::RefreshContour() // virtual
 //--------------------------------------------------------------
        // EED 27 sep 2006
        //                      _pts->SetPoint(i, x,y,z );
-                               _pts->SetPoint(i , x*_spc[0] , y*_spc[1] , z*_spc[2] );
-
+                               _pts->SetPoint(i, x*_spc[0], y*_spc[1], z*_spc[2] );
 
                        }// for
                }
@@ -108,7 +104,7 @@ void manualViewContour::RefreshText()  // virtual
                int size = GetNumberOfPoints();
                char text[50];
                char resultText[50];
-               strcpy(resultText," ");
+               strcpy(resultText, "000");
 
 //CMRU 19-08-09 ----------------------------------
                std::string label;
@@ -118,7 +114,7 @@ void manualViewContour::RefreshText()  // virtual
                if (size==2)
                {
                        strcpy(resultText,"L= ");
-                       gcvt ( _mesureScale * this->_manContModel->GetPathSize() , 5, text );
+                       gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
                        strcat(resultText,text);
 
 //CMRU 19-08-09 ----------------------------------
@@ -131,14 +127,15 @@ void manualViewContour::RefreshText()  // virtual
                        if (_manContModel->IfCloseContour()==true)
                        {
                                strcpy(resultText,"P= ");
-                               gcvt ( _mesureScale * this->_manContModel->GetPathSize() , 5, text );
+                               gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
                                strcat(resultText,text);
-                               gcvt ( _mesureScale * _mesureScale * this->_manContModel->GetPathArea() , 5, text );
+                               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 );
+                               gcvt (  _mesureScale * this->_manContModel->GetPathSize(), 5, text );
                                strcat(resultText,text);
                        }
 //CMRU 19-08-09 ----------------------------------
@@ -173,7 +170,6 @@ void manualViewContour::RefreshText()  // virtual
 
                        _textActor->SetPosition(px+GetRange()+1,py);
                }
-
        }
 }
 
@@ -203,7 +199,6 @@ bool manualViewContour::ifTouchContour(int x,int y,int z){
                nps_t = nps-1;
        }
 
-       
        for( i = 0; i < nps_t; i++ ) 
        {
                _pts->GetPoint(i%nps, ppA);
@@ -219,7 +214,6 @@ bool manualViewContour::ifTouchContour(int x,int y,int z){
                        i=nps;
                }
        }
-       
        return result;
 }