X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR3DViewCntrlPanel.cxx;h=1b42594a01beb9ceef32121178a16e898f38688f;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=82855f7a228d54b534295107e19948201fdee7ff;hpb=de780cf6e58ab772bd5a5947ab1beee10acb073d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index 82855f7..1b42594 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -62,7 +62,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 
 	_ckBoxXYZ					= new wxCheckBox(panel,-1,_T("3D Axis  "));
 	_ckBoxFixAxis2D				= new wxCheckBox(panel,-1,_T("2D Fix Axis"));
-	_opacityAxis				= new wxSlider(panel,-1,50,0,100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_opacityAxis				= new wxSlider(panel,-1,100,0,100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
 
 	_ckBoxPlane					= new wxCheckBox(panel,-1,_T("Plane"));
 ////EED 05Nov2012	_ckBox_BW_Color_Plane		= new wxCheckBox(panel,-1,_T("GL/Color"));
@@ -86,14 +86,32 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	_ckBoxXYZ->SetValue(false);
 ////EED 05Nov2012	_ckBox_BW_Color_Plane->SetValue(true);
 	_ckBoxPlane->SetValue(false);
-	_ckBoxOutline= new wxCheckBox(panel,-1,_T("Outline"));
-	_ckBoxOutline->SetValue(true);
 	_ckBoxInterpolate= new wxCheckBox(panel,-1,_T("Interpolate"));
 	_ckBoxInterpolate->SetValue(true);
 
 
-	_ckBoxBackGroundBlack= new wxCheckBox(panel,-1,_T("Background Black"));;
-	_ckBoxBackGroundBlack->SetValue(false);
+	_ckBoxOutlineBox	= new wxCheckBox(panel,-1,_T("Outline Box"));
+	_ckBoxOutlineBox->SetValue(true);
+	_ckBoxOutlinePlane	= new wxCheckBox(panel,-1,_T("Outline Plane"));
+	_ckBoxOutlinePlane->SetValue(true);
+
+
+	
+//	_ckBoxBackGroundBlack= new wxCheckBox(panel,-1,_T("Background Black"));;
+//	_ckBoxBackGroundBlack->SetValue(false);
+// EED Borrame	
+//	_ckBoxBackGroundBlack= new wxCheckBox(panel,-1,_T("Background Black"));;
+//	_ckBoxBackGroundBlack->SetValue(false);
+
+	wxPanel *panelH7 = new wxPanel(panel);
+
+	_rdBackGroundGradient	= new wxRadioButton( panelH7, -1, _T("Background Gradient"),wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+	_rdBackGroundBlack		= new wxRadioButton( panelH7, -1, _T("Background Black"),wxDefaultPosition, wxDefaultSize, 0);
+	_rdBackGroundWhite 		= new wxRadioButton( panelH7, -1, _T("Background White"),wxDefaultPosition, wxDefaultSize, 0);
+
+	_rdBackGroundGradient->SetValue(false);
+	_rdBackGroundBlack->SetValue(false);
+	_rdBackGroundWhite->SetValue(false);
 
 	_positionX->SetSize(400,20);
 	_positionY->SetSize(400,20);
@@ -128,8 +146,16 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	Connect(btnFreePlanesOrtho->GetId()		, wxEVT_COMMAND_BUTTON_CLICKED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnFreePlanesOrtho	);
 	Connect(_ckFreePlaneInteraction->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneInteraction );
 	Connect(_cbStereo->GetId()				, wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnSetStereo 		);
-	Connect(_ckBoxOutline->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnOutline 			);
-	Connect(_ckBoxBackGroundBlack->GetId()	, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack 	);
+	Connect(_ckBoxOutlineBox->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnOutlineBox 			);
+	Connect(_ckBoxOutlinePlane->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnOutlinePlane 			);
+
+// EED Borrame
+//	Connect(_ckBoxBackGroundBlack->GetId()	, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack 	);
+	Connect(_rdBackGroundGradient->GetId()	, wxEVT_COMMAND_RADIOBUTTON_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack 	);
+	Connect(_rdBackGroundBlack->GetId()	, wxEVT_COMMAND_RADIOBUTTON_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack 	);
+	Connect(_rdBackGroundWhite->GetId()	, wxEVT_COMMAND_RADIOBUTTON_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack 	);
+
+
 	Connect(_ckBoxInterpolate->GetId()		, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnInterpolate 		);
 	Connect(_ckBoxFixAxis2D->GetId()		, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnFixAxis2D 		);
 	Connect(_opacityAxis->GetId()			, wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnOpacityAxis 		);
@@ -145,6 +171,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	wxFlexGridSizer *sizerH4a;
 	wxFlexGridSizer *sizerH5;
 	wxFlexGridSizer *sizerH6;
+	wxFlexGridSizer *sizerH7;
 
 	if(align)
 	{
@@ -198,8 +225,20 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 		sizerH5->Add( _cbStereo									, 1, wxALL|wxEXPAND						, 0);
 		
 		sizerH6 = new wxFlexGridSizer(1);
-		sizerH6->Add( _ckBoxOutline								, 1, wxALL|wxEXPAND						, 0);
-		sizerH6->Add( _ckBoxBackGroundBlack						, 1, wxALL|wxEXPAND						, 0);
+		sizerH6->Add( _ckBoxOutlineBox							, 1, wxALL|wxEXPAND						, 0);
+		sizerH6->Add( _ckBoxOutlinePlane						, 1, wxALL|wxEXPAND						, 0);
+
+
+
+		sizerH7 = new wxFlexGridSizer(1);
+		panelH7->SetSizer(sizerH7);
+		sizerH7->Add( _rdBackGroundGradient						, 1, wxALL|wxEXPAND						, 0);
+		sizerH7->Add( _rdBackGroundBlack						, 1, wxALL|wxEXPAND						, 0);
+		sizerH7->Add( _rdBackGroundWhite						, 1, wxALL|wxEXPAND						, 0);
+
+
+		sizerH6->Add( new wxStaticText(panel, -1,_T(" "))		, 1, wxALL|wxEXPAND						, 0);
+		sizerH6->Add( panelH7									, 1, wxALL|wxEXPAND						, 0);
 
 		sizer->Add( sizerH4,  1, wxALL|wxGROW,	2);
 		sizer->Add( sizerH5,  1, wxALL|wxEXPAND,2);
@@ -276,6 +315,10 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	//	sizerH5->Add( ckBoxZ				,  1, wxALL|wxEXPAND, 0);
 
 
+		panelH7->SetAutoLayout(true);
+		panelH7->Layout();
+
+
 	panel->ClearBackground();
 //	panel->SetSize(400,50);
 	sizer->FitInside(panel);
@@ -741,22 +784,38 @@ void wxVtkMPR3DViewCntrlPanel::SetVisiblePlane(bool value)
 
 
 //-------------------------------------------------------------------
-void wxVtkMPR3DViewCntrlPanel::OnOutline(wxCommandEvent& event)
+void wxVtkMPR3DViewCntrlPanel::OnOutlineBox(wxCommandEvent& event)
 {
-	_wxvtkmpr3Dview->showOutlineActor( _ckBoxOutline->GetValue() );
+	_wxvtkmpr3Dview->showOutlineBoxActor( _ckBoxOutlineBox->GetValue() );
 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->Refresh();
+}
 
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::OnOutlinePlane(wxCommandEvent& event)
+{
+	_wxvtkmpr3Dview->showOutlinePlaneActor( _ckBoxOutlinePlane->GetValue() );
+	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->Refresh();
 }
 
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack(wxCommandEvent& event)
 {
-	if (_ckBoxBackGroundBlack->GetValue()==true)
-	{
+//EED Borrame
+//	if (_ckBoxBackGroundBlack->GetValue()==true)
+//	{
+//		_wxvtkmpr3Dview->SetBackGroundType(0);
+//	} else {
+//		_wxvtkmpr3Dview->SetBackGroundType(1);
+//	}
+	
+	if (_rdBackGroundGradient->GetValue()==true) {
 		_wxvtkmpr3Dview->SetBackGroundType(0);
-	} else {
+	} else if (_rdBackGroundBlack->GetValue()==true) {
 		_wxvtkmpr3Dview->SetBackGroundType(1);
+	} else if (_rdBackGroundWhite->GetValue()==true) {
+		_wxvtkmpr3Dview->SetBackGroundType(2);
 	}
+	
 }
 
 //-------------------------------------------------------------------