#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / WidgetShowNPoints.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
index 0190f82d55f4a296eb120b235b3478f0af7e95d7..8f094a6c6bb0f4530ba772a176882492e1f2292f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
@@ -241,7 +241,14 @@ void WidgetShowNPoints::AddVtkPoint()
        //NTU: For updating points
        lstSourceSphere.push_back(vtksphere);
        vtkPolyDataMapper *sphereMapper = vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        sphereMapper->SetInput( vtksphere->GetOutput() );
+#else
+       sphereMapper->SetInputData( vtksphere->GetOutput() );
+#endif
+
        vtkActor *sphereActor   = vtkActor::New();
        sphereActor->SetMapper(sphereMapper);
        sphereActor->SetOrigin(0, 0, 0);
@@ -548,13 +555,13 @@ void  WidgetShowNPoints::SetInitLstPoints( std::vector<int> initLstPointsX,  std
        } // if size
 }
 //------------------------------------------------------------------------
-void WidgetShowNPoints::WidgetShowNPoints::SetType(int type)
+void WidgetShowNPoints::SetType(int type)
 {
        mtype=type;
 }
 
 //------------------------------------------------------------------------
-int WidgetShowNPoints::WidgetShowNPoints::GetType()
+int WidgetShowNPoints::GetType()
 {
        return mtype;
 }