#3470 merge vtk8itk5wx3-mingw64

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
index 9e394c065b74c3ce4d7d795e80bb9135e3de138a..58198eef1edbc9d72a39225f21f0233a5b166916 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -44,7 +44,7 @@ manualViewBaseContour::manualViewBaseContour()
        _contourVtkActor        = NULL;
        _bboxMapper                     = NULL;
        _range                          = 1;
-       _sizePointsContour      = 100;
+       _sizePointsContour      = 500;
        _spc[0]                         = 1;
        _spc[1]                         = 1;
        _spc[2]                         = 1;
@@ -355,7 +355,7 @@ void manualViewBaseContour::InitTextActor()
 //     _textActor->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
 
        vtkTextProperty *tprop = _textActor->GetTextProperty();
-       tprop->SetFontSize(14);
+       tprop->SetFontSize(12);
        tprop->SetFontFamilyToArial();
        tprop->SetColor(1, 1, 0);
 
@@ -371,7 +371,7 @@ void manualViewBaseContour::InitTextActor()
 //     _textActor2->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
 
        vtkTextProperty *tprop2 = _textActor2->GetTextProperty();
-       tprop2->SetFontSize(14);
+       tprop2->SetFontSize(12);
        tprop2->SetFontFamilyToArial();
        tprop2->SetColor(1, 1, 0);
 
@@ -649,10 +649,11 @@ double* manualViewBaseContour::GetVectorPointsXManualContour(){
        double pp[3];
        int i,size = _sizePointsContour;
        double *vx = (double*)malloc(sizeof(double)*size);
-       for (i=0;i<size;i++){
+       for (i=0;i<size;i++)
+       {
                _pts->GetPoint(i,pp);
                vx[i]=pp[0];
-       }
+       } // for i
        return vx;
 }
 // ----------------------------------------------------------------------------
@@ -661,10 +662,11 @@ double* manualViewBaseContour::GetVectorPointsYManualContour()
        double pp[3];
        int i,size = _sizePointsContour;
        double *vy = (double*)malloc(sizeof(double)*size);
-       for (i=0;i<size;i++){
+       for (i=0;i<size;i++)
+       {
                _pts->GetPoint(i,pp);
                vy[i]=pp[1];
-       }
+       } // for i
        return vy;
 }
 // ----------------------------------------------------------------------------
@@ -673,10 +675,11 @@ double* manualViewBaseContour::GetVectorPointsZManualContour()
        double pp[3];
        int i,size = _sizePointsContour;
        double *vz = (double*)malloc(sizeof(double)*size);
-       for (i=0;i<size;i++){
+       for (i=0;i<size;i++)
+       {
                _pts->GetPoint(i,pp);
                vz[i]=pp[2];
-       }
+       } // for i
        return vz;
 }
 // ----------------------------------------------------------------------------
@@ -687,10 +690,11 @@ void manualViewBaseContour::Refresh() // virtual
                RefreshContour();
        }
        int i,size=_lstViewPoints.size();
-       for (i=0;i<size;i++){
+       for (i=0;i<size;i++)
+       {
                UpdateViewPoint(i);
                _lstViewPoints[i]->UpdateColorActor();
-       }
+       } // for i
        UpdateColorActor();
 
        if (_show_text==true)
@@ -976,8 +980,8 @@ void manualViewBaseContour::SetShowText(bool ok)
        _show_text = ok;
        if (_show_text==false && _textActor!=NULL)
        {
-               _textActor->SetInput("00");
-               _textActor2->SetInput("00");
+               _textActor->SetInput("");
+               _textActor2->SetInput("");
        }
 }
 // ----------------------------------------------------------------------------