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

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
index a888215dc78262188dcaa7fade05be4dc4b72176..1e723a13e09b5973e0d1cbf9aa096a721d2c89ac 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
@@ -209,9 +209,19 @@ void vtkClipping3DDataViewer::SetImage()
        vtkImageData *imagedata=_vtkmprbasedata->GetImageData();
        for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _mCubes[i]->SetInput( imagedata );
+#else
+               _mCubes[i]->SetInputData( imagedata );
+#endif
        } // for
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _volumeMapper->SetInput( imagedata );
+#else
+       _volumeMapper->SetInputData( imagedata );
+#endif
        _volumerendererdata->SetImageData( imagedata );
 }
 
@@ -226,21 +236,50 @@ void vtkClipping3DDataViewer::Configure_Tissue()
        {
                // Visualisation - original volume
                _mCubes[i] = vtkMarchingCubes::New( );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _mCubes[i]->SetInput( imagedata );
+#else
+               _mCubes[i]->SetInputData( imagedata );
+#endif
+
                _mCubes[i]->SetValue( 0, range[1]*(4+i) / 8 );
 //             _mCubes[i]->SetValue( 0, 1500 );
            _tissueStripper[i] = vtkStripper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
            _tissueStripper[i]->SetInput( _mCubes[i]->GetOutput( ) );
+#else
+           _tissueStripper[i]->SetInputData( _mCubes[i]->GetOutput( ) );
+#endif
+
                _tissuePlanes[i]  = vtkPlanes::New();
                int x1,x2,y1,y2,z1,z2;
                imagedata->GetExtent(x1,x2,y1,y2,z1,z2);
                _tissuePlanes[i]->SetBounds  (x1,x2,y1,y2,z1,z2);
                _tissueClipper[i] = vtkClipPolyData::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _tissueClipper[i]->SetInput( _tissueStripper[i]->GetOutput() );
+#else
+               _tissueClipper[i]->SetInputData( _tissueStripper[i]->GetOutput() );
+#endif
+
                _tissueClipper[i]->SetClipFunction( _tissuePlanes[i] );
                _tissueClipper[i]->InsideOutOn( );
                _tissueMapper[i] = vtkPolyDataMapper::New( );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _tissueMapper[i]->SetInput( _tissueClipper[i]->GetOutput() );
+#else
+               _tissueMapper[i]->SetInputData( _tissueClipper[i]->GetOutput() );
+#endif
+
+
                _tissueMapper[i]->ScalarVisibilityOff( );
 //             _tissueMapper[i]->Update();
        } // for i  
@@ -351,7 +390,15 @@ void vtkClipping3DDataViewer::Configure_Volume()
        // EED 13/03/2011
 
  // _volumeMapper = vtkVolumeRayCastMapper::New();
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _volumeMapper->SetInput( this->GetVtkMPRBaseData()->GetImageData() );
+#else
+       _volumeMapper->SetInputData( this->GetVtkMPRBaseData()->GetImageData() );
+#endif
+
 
     _volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
 
@@ -485,7 +532,14 @@ void vtkClipping3DDataViewer::Configure()
   // An outline provides context around the data.
   //
        _outlineData    = vtkOutlineFilter::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     _outlineData->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#else
+    _outlineData->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#endif
+
        _mapOutline     = vtkPolyDataMapper::New();
 
 //EED 4 nov 2015 Estelle 
@@ -772,7 +826,14 @@ void vtkClipping3DDataViewer::ReadMeshVTK(char *namefile)
        vtkDataSetReader *reader = vtkDataSetReader::New();
        reader->SetFileName(namefile);
        reader->Update();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _tissueStripper[3]->SetInput( reader->GetPolyDataOutput()  );
+#else
+       _tissueStripper[3]->SetInputData( reader->GetPolyDataOutput()  );
+#endif
+
 }
 
 void vtkClipping3DDataViewer::setColorTransferFunction(vtkColorTransferFunction* colortable){