X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.cpp;h=68db204e99233335b6324a97b1d43d853e487539;hb=e2f602be451f1017507d34aa338632800590f10a;hp=b26adf9b6e07335fb27949e626a42a545add2297;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index b26adf9..68db204 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -372,7 +372,8 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
 	{ 
 		mwxvtkmpr3Dview		->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);		
 		mwxvtkmpr3Dview		->Configure();
-		mwxvtkmpr3Dview		->ResetCamera(ext,org,spc);
+//EED 27/05/2013
+		mwxvtkmpr3Dview		->GetWxvtk3Dbaseview()->ResetCamera(ext	,spc);
 		vtkInteractorStyleBaseView* vtkInteractorBV = (vtkInteractorStyleBaseView*)mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView();
 		vtkInteractorBV->AddParentToReport(this);
 	}
@@ -482,28 +483,20 @@ void wxMaracasRenderTabbedPanel::addRemoveActorMPR(bool addremove)
 	if(addremove)
 	{
 		wxtabs->GetPage(id)->Enable();
-
 		bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX();
 		bool valueY = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleY();
 		bool valueZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleZ();
 		bool valueXYZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleXYZ();
 		bool valuePlane = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisiblePlane();
-
 		mwxvtkmpr3Dview->VisibleImageActor( 0, valueX );
 		mwxvtkmpr3Dview->VisibleImageActor( 1, valueY );
 		mwxvtkmpr3Dview->VisibleImageActor( 2, valueZ );
 		mwxvtkmpr3Dview->VisiblePointWidget(valueXYZ);
 		mwxvtkmpr3Dview->VisiblePlaneWidget(valuePlane);
 		mwxvtkmpr3Dview->showOutlineActor(true);
-		
 		mwxvtkmpr3Dview->Refresh();
-
-
-	}
-	else
-	{
+	} else {
 		wxtabs->GetPage(id)->Disable();
-
 		mwxvtkmpr3Dview->VisiblePointWidget(false);
 		mwxvtkmpr3Dview->VisiblePlaneWidget(false);
 		mwxvtkmpr3Dview->VisibleImageActor(0, false );
@@ -511,10 +504,14 @@ void wxMaracasRenderTabbedPanel::addRemoveActorMPR(bool addremove)
 		mwxvtkmpr3Dview->VisibleImageActor(2, false );
 		mwxvtkmpr3Dview->showOutlineActor(false);
 		mwxvtkmpr3Dview->Refresh();
-
 		wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  		mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
-	}
+#else
+ 		mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
+	} // if
 }
 
 
@@ -822,13 +819,18 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
 	}*/
 }
 
+
 void wxMaracasRenderTabbedPanel::OnRefreshView(wxCommandEvent & event) 
 {
 	printf("CPR wxMaracasRenderTabbedPanel::OnRefreshView \n");
 	mwxvtkmpr3Dview->RefreshView();
-
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 
 /**