X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR3DViewCntrlPanel.h;h=d5025bfb22aeca2b64c33d8c14d5a71d4f807add;hb=659bcd2c2a608cfb8c5854ffe84e9248871df9a1;hp=b3f971d53abf4a8136d221bb8977178020af8d08;hpb=3283472f764535492122c3b2ade020a749c1bd2a;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
index b3f971d..d5025bf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
@@ -45,18 +45,19 @@ public:
 	void		OnPositionZ(wxScrollEvent& event);
 	void		OnVisibleAxisXYZ(wxCommandEvent& event);
 	void		OnVisiblePlane(wxCommandEvent& event);
-	void		OnEditColorTable(wxCommandEvent& event);
-////EED 05Nov2012	void		On_BW_Color_Plane(wxCommandEvent& event);
-	
+	void		OnEditColorTable(wxCommandEvent& event);	
 	void 		OnVisibleFreePlaneX(wxCommandEvent& event);
 	void 		OnVisibleFreePlaneY(wxCommandEvent& event);
 	void 		OnVisibleFreePlaneZ(wxCommandEvent& event);
 	void 		OnVisibleFreePlaneInteraction(wxCommandEvent& event);
 	void 		OnSetStereo(wxCommandEvent& event);
 	void 		OnFreePlanesOrtho(wxCommandEvent& event);
-	void 		OnOutline(wxCommandEvent& event);
+	void 		OnOutlineBox(wxCommandEvent& event);
+	void 		OnOutlinePlane(wxCommandEvent& event);
 	void 		OnBackGroundBlack(wxCommandEvent& event);
 	void 		OnInterpolate(wxCommandEvent& event);
+	void		OnFixAxis2D(wxCommandEvent& event);
+	void		OnOpacityAxis(wxCommandEvent& event);
 
 
 	virtual void Refresh();
@@ -100,6 +101,8 @@ private:
 ////EED 05Nov2012	wxCheckBox		*_ckBox_BW_Color_Plane;
 	
 	wxCheckBox		*_ckBoxXYZ;
+	wxCheckBox		*_ckBoxFixAxis2D;
+	wxSlider		*_opacityAxis;
 	wxCheckBox		*_ckBoxPlane;
 	
 	wxCheckBox      *_ckFreePlaneX;
@@ -109,8 +112,15 @@ private:
 	
 	wxComboBox		*_cbStereo;
 
-	wxCheckBox		*_ckBoxOutline;
-	wxCheckBox		*_ckBoxBackGroundBlack;
+	wxCheckBox		*_ckBoxOutlineBox;
+	wxCheckBox		*_ckBoxOutlinePlane;
+	
+// EED Borrame
+//	wxCheckBox		*_ckBoxBackGroundBlack;
+	wxRadioButton	*_rdBackGroundBlack;
+	wxRadioButton	*_rdBackGroundWhite;
+	wxRadioButton	*_rdBackGroundGradient;
+	
 	wxCheckBox		*_ckBoxInterpolate;
 
 protected: