X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR3DViewCntrlPanel.cxx;h=33294b4fd304add2ba24d1f761b99aba9e6d0e2c;hb=04daf8279bb4bd4219f2903e7352e36db8d88866;hp=d717de5778248cd156f911af081ce55380a77781;hpb=c5bb8b228d6fcd2a4ea1d6210bfa3a39d6bcac33;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index d717de5..33294b4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -141,6 +141,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	//	wxBoxSizer *sizerH4 = new wxBoxSizer(wxHORIZONTAL);
 	
 	//CPR: If-else statements added 30 Nov 2009
+	wxFlexGridSizer *sizerV1;
 	wxFlexGridSizer *sizerH4;
 	wxFlexGridSizer *sizerH5;
 	wxFlexGridSizer *sizerH6;
@@ -149,7 +150,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	{
 		sizer	= new wxFlexGridSizer(4);
 		sizerH4 = new wxFlexGridSizer(3);
-		
+				
 		sizerH4->Add( new wxStaticText(panel, -1,_T(" "))	, 1, wxALL|wxEXPAND, 0);
 		sizerH4->Add( new wxStaticText(panel, -1,_T("GL"))	, 1, wxALL|wxEXPAND, 0);
 		sizerH4->Add( new wxStaticText(panel, -1,_T("Color   "))	, 1, wxALL|wxEXPAND, 0);
@@ -170,12 +171,8 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 		sizerH4->Add( _ckBoxInterpolate				, 1, wxALL|wxEXPAND, 0);
 		sizerH4->Add( new wxStaticText(panel, -1,_T(" "))	, 1, wxALL|wxEXPAND, 0);
 		sizerH4->Add( new wxStaticText(panel, -1,_T(" "))	, 1, wxALL|wxEXPAND, 0);
-		
-		
-		
-		
+				
 		sizerH5 = new wxFlexGridSizer(1);
-		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))	, 1, wxALL|wxEXPAND, 0);
 		sizerH5->Add( _ckBoxXYZ					, 1, wxALL|wxEXPAND, 0);
 		sizerH5->Add( _ckBoxPlane				, 1, wxALL|wxEXPAND, 0);		
 		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))	, 1, wxALL|wxEXPAND, 0);
@@ -191,12 +188,10 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 		sizerH6->Add( _ckBoxOutline					, 1, wxALL|wxEXPAND, 0);
 		sizerH6->Add( _ckBoxBackGroundBlack			, 1, wxALL|wxEXPAND, 0);
 
-
 		sizer->Add( sizerH4,  1, wxALL|wxGROW,	2);
 		sizer->Add( sizerH5,  1, wxALL|wxEXPAND,2);
 		sizer->Add( sizerH6,  1, wxALL|wxEXPAND,2);
-		
-		
+			
 	}	else	{
 		sizer	 = new wxFlexGridSizer(1);
 
@@ -268,7 +263,9 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	//	sizerH5->Add( ckBoxZ				,  1, wxALL|wxEXPAND, 0);
 
 
-	panel->SetSize(400,50);
+	panel->ClearBackground();
+//	panel->SetSize(400,50);
+	sizer->FitInside(panel);
 	panel->SetAutoLayout(true);
 	panel->SetSizer(sizer);
 	panel->Layout();
@@ -532,7 +529,12 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX(wxCommandEvent& event)
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
 
 	try{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  		_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 		_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 	}catch(char* e){
 		std::cout<<e<<std::endl;
 	}
@@ -544,17 +546,25 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY(wxCommandEvent& event)
 	_wxvtkmpr3Dview->Refresh();
 
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
-
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ(wxCommandEvent& event)
 {
 	_wxvtkmpr3Dview->VisibleImageActor(2, event.IsChecked() );
 	_wxvtkmpr3Dview->Refresh();
-
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 
 //-------------------------------------------------------------------
@@ -568,7 +578,6 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ(wxCommandEvent& event)
 void wxVtkMPR3DViewCntrlPanel::OnVisiblePlane(wxCommandEvent& event)
 {
 	_wxvtkmpr3Dview->VisiblePlaneWidget(event.IsChecked());
-
 }
 
 //-------------------------------------------------------------------
@@ -578,7 +587,12 @@ void wxVtkMPR3DViewCntrlPanel::OnPositionX(wxScrollEvent& event)
 	_wxvtkmpr3Dview->RefreshView();
 
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnPositionY(wxScrollEvent& event)
@@ -586,7 +600,12 @@ void wxVtkMPR3DViewCntrlPanel::OnPositionY(wxScrollEvent& event)
 	_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->SetY( _positionY->GetValue() );
 	_wxvtkmpr3Dview->RefreshView();
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnPositionZ(wxScrollEvent& event)
@@ -594,7 +613,12 @@ void wxVtkMPR3DViewCntrlPanel::OnPositionZ(wxScrollEvent& event)
 	_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->SetZ( _positionZ->GetValue() );
 	_wxvtkmpr3Dview->RefreshView();
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 
 
@@ -645,7 +669,12 @@ void wxVtkMPR3DViewCntrlPanel::SetVisibleX(bool value)
 	_wxvtkmpr3Dview->Refresh();
 
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 
 //-------------------------------------------------------------------
@@ -657,7 +686,12 @@ void wxVtkMPR3DViewCntrlPanel::SetVisibleY(bool value)
 	_wxvtkmpr3Dview->Refresh();
 
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 
 //-------------------------------------------------------------------
@@ -669,7 +703,12 @@ void wxVtkMPR3DViewCntrlPanel::SetVisibleZ(bool value)
 	_wxvtkmpr3Dview->Refresh();
 
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
  	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
 }
 
 //-------------------------------------------------------------------