X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtk2DBaseView.cxx;h=393b3f1160bf84c6ea866df1e7bba3c60459cc32;hb=ca967e00cd510d1fbd49b18e6f0004afdb322e98;hp=175c07439f1a9a7d3a26726034c8ca60df803c81;hpb=b6368e519e4fc1e5df411489848e54d4e26bf4ec;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
index 175c074..393b3f1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
@@ -108,10 +108,15 @@ void wxVtk2DBaseView::ResetView()
 	crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
 	vtkImageData *imageData	= GetVtkBaseData()->GetImageData();
 	if(imageData){
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		imageData->UpdateInformation();
 		imageData->SetUpdateExtent( imageData->GetWholeExtent());
 		imageData->Update();
 		_imageViewer2XYZ->GetVtkImageViewer2()->SetInput(imageData );
+#else
+		_imageViewer2XYZ->GetVtkImageViewer2()->SetInputData(imageData );
+#endif
 		imageData->GetSpacing (spx,spy,spz);
 		imageData->GetExtent (x1,x2,y1,y2,z1,z2);
 	}
@@ -151,7 +156,12 @@ void wxVtk2DBaseView::SetImageToVtkViewer(vtkImageData *imageData)
 {
 	if (_imageViewer2XYZ!=NULL)
 	{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_imageViewer2XYZ->GetVtkImageViewer2()->SetInput( imageData );
+#else
+		_imageViewer2XYZ->GetVtkImageViewer2()->SetInputData( imageData );
+#endif
 	} // if _imageViewer2XYZ
 }
 
@@ -193,9 +203,16 @@ void wxVtk2DBaseView::Configure(bool okimage)
 	vtkImageData *imageData	= GetVtkBaseData()->GetMarImageData()->GetImageData();
 	if (imageData!=NULL)
 	{
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		imageData->UpdateInformation();
 		imageData->SetUpdateExtent( imageData->GetWholeExtent());
 		imageData->Update();
+#else
+		//...
+#endif
+
 		if (okimage==true){
 			imageData->GetSpacing (spx,spy,spz);
 			imageData->GetExtent (x1,x2,y1,y2,z1,z2);