#3138 creaMaracasVisu Feature New Normal - branch vtk7itk4wx3

[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..e1588bf4f3cae10683c1d5523ac6f3e95a2bcee5 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -286,8 +286,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 +315,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 +335,7 @@ void manualViewBaseContour::ConstructVTKObjects()
        InitTextActor();
 }
 
+// ----------------------------------------------------------------------------
 void manualViewBaseContour::SetCellArray(bool type)
 {
        if (type==true)
@@ -351,7 +362,7 @@ void manualViewBaseContour::InitTextActor()
        vtkTextProperty *tprop = _textActor->GetTextProperty();
        tprop->SetFontSize(14);
        tprop->SetFontFamilyToArial();
-       tprop->SetColor(0, 0, 1);
+       tprop->SetColor(1, 1, 0);
 
 
        //      Text 2
@@ -367,7 +378,7 @@ void manualViewBaseContour::InitTextActor()
        vtkTextProperty *tprop2 = _textActor2->GetTextProperty();
        tprop2->SetFontSize(14);
        tprop2->SetFontFamilyToArial();
-       tprop2->SetColor(0, 0, 1);
+       tprop2->SetColor(1, 1, 0);
 
 }