#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[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 91f1c1bb14a24c7f80c6167217f5a82daa53a6a8..6e334f40cd0200ea1d6cf37b7f4fb9d58738306e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -48,21 +48,16 @@ manualViewBaseContour::manualViewBaseContour()
        _spc[0]                         = 1;
        _spc[1]                         = 1;
        _spc[2]                         = 1;
-
        _coulorEdit_r           = 1;
        _coulorEdit_g           = 1;
        _coulorEdit_b           = 0;
-
        _coulorNormal_r         = 1;
        _coulorNormal_g         = 0;
        _coulorNormal_b         = 1;
-
        _coulorSelection_r      = 0;
        _coulorSelection_g      = 1;
        _coulorSelection_b      = 0;
-
        _widthline                      = 1;
-
 }
 // ----------------------------------------------------------------------------
 manualViewBaseContour::~manualViewBaseContour()
@@ -121,7 +116,7 @@ void manualViewBaseContour :: AddCompleteContourActor(  bool ifControlPoints )
 }
 // ---------------------------------------------------------------------------
 
-void manualViewBaseContour :: RemoveCompleteContourActor()
+void manualViewBaseContour::RemoveCompleteContourActor()
 {
        /*vtkRenderer * theRenderer =*/  _wxvtkbaseview->GetRenderer(); // JPRx ??
         //Removing the spline
@@ -286,8 +281,10 @@ void manualViewBaseContour::ConstructVTKObjects()
 //EED 29Mars2009       
        //_pts->SetPoint(0,     0       , 0     , -1000 );
        //_pts->SetPoint(1,     0       , 0     ,  1000 );
-       _pts->SetPoint(0,       -1000   , -1000 , -1000 );
-       _pts->SetPoint(1,       1000    , 1000  , 1000  );
+
+//EED 2017-03-02
+//     _pts->SetPoint(0,       -1000   , -1000 , -1000 );
+//     _pts->SetPoint(1,       1000    , 1000  , 1000  );
 
        // This is the structure for the spline
        _splineCell = vtkCellArray::New();
@@ -313,7 +310,15 @@ void manualViewBaseContour::ConstructVTKObjects()
     _bboxMapper                        =       vtkPolyDataMapper::New();
     _bboxMapper->ScalarVisibilityOff( );
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _bboxMapper->SetInput(_pd);
+#else
+       _bboxMapper->SetInputData(_pd);
+#endif
+
+
        _bboxMapper->ImmediateModeRenderingOn();
        _contourVtkActor->SetMapper(_bboxMapper);
        _contourVtkActor->GetProperty()->BackfaceCullingOff();
@@ -325,6 +330,7 @@ void manualViewBaseContour::ConstructVTKObjects()
        InitTextActor();
 }
 
+// ----------------------------------------------------------------------------
 void manualViewBaseContour::SetCellArray(bool type)
 {
        if (type==true)
@@ -349,9 +355,9 @@ void manualViewBaseContour::InitTextActor()
 //     _textActor->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
 
        vtkTextProperty *tprop = _textActor->GetTextProperty();
-       tprop->SetFontSize(14);
+       tprop->SetFontSize(12);
        tprop->SetFontFamilyToArial();
-       tprop->SetColor(0, 0, 1);
+       tprop->SetColor(1, 1, 0);
 
 
        //      Text 2
@@ -365,9 +371,9 @@ void manualViewBaseContour::InitTextActor()
 //     _textActor2->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
 
        vtkTextProperty *tprop2 = _textActor2->GetTextProperty();
-       tprop2->SetFontSize(14);
+       tprop2->SetFontSize(12);
        tprop2->SetFontFamilyToArial();
-       tprop2->SetColor(0, 0, 1);
+       tprop2->SetColor(1, 1, 0);
 
 }
 
@@ -970,8 +976,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("");
        }
 }
 // ----------------------------------------------------------------------------