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=19c9dec4f7310798c132260a62c8a7c425d4acf4;hp=bd26d120d364e66401ac592ac30059cd5db585ce;hpb=b80b4dcc301c1c2c63c0f76cd06b0a434350f7a7;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
index bd26d12..393b3f1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
@@ -105,13 +105,18 @@ void wxVtk2DBaseView::ResetView()
 	int x1 = 1,x2 = 1,y1 = 1,y2 = 1,z1 = 1,z2 = 1;
 	wxVtkBaseView::Configure();
 
-	wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
+	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
 }
 
@@ -166,7 +176,7 @@ void wxVtk2DBaseView::Configure(bool okimage)
 	if (_imageViewer2XYZ==NULL)
 	{
 		_imageViewer2XYZ = new vtkImageViewer2_XYZ();
-		wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
+		crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
 		_imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren );
 
 		//////////////
@@ -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);
@@ -313,7 +330,7 @@ void wxVtk2DBaseView::Refresh()
 void wxVtk2DBaseView::SetInteractorStyleImage(vtkInteractorStyleBaseView *interactorstylebaseview)
 {
 	SetInteractorStyleBaseView(interactorstylebaseview);
-	wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
+	crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
 	interactorstylebaseview->SetInteractor ( iren );
 	iren->SetInteractorStyle(interactorstylebaseview);
 	interactorstylebaseview->SetwxVtkBaseView(this);