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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
index fbd17a5..d5025bf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef WXVTKMPR3DVIEWCNTRLPANEL_H_
 #define WXVTKMPR3DVIEWCNTRLPANEL_H_
 
@@ -20,18 +45,23 @@ 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 OnVisibleFreePlaneX(wxCommandEvent& event);
-	void OnVisibleFreePlaneY(wxCommandEvent& event);
-	void OnVisibleFreePlaneZ(wxCommandEvent& event);
-	void OnVisibleFreePlaneInteraction(wxCommandEvent& event);
-	void OnSetStereo(wxCommandEvent& event);
-	void OnFreePlanesOrtho(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 		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();
-	void		UpdateControlPanel();
+	void		UpdateControlPanel(bool firsttime=true);
 
 	bool		GetVisibleX();
 	bool		GetVisibleY();
@@ -71,6 +101,8 @@ private:
 ////EED 05Nov2012	wxCheckBox		*_ckBox_BW_Color_Plane;
 	
 	wxCheckBox		*_ckBoxXYZ;
+	wxCheckBox		*_ckBoxFixAxis2D;
+	wxSlider		*_opacityAxis;
 	wxCheckBox		*_ckBoxPlane;
 	
 	wxCheckBox      *_ckFreePlaneX;
@@ -80,6 +112,16 @@ private:
 	
 	wxComboBox		*_cbStereo;
 
+	wxCheckBox		*_ckBoxOutlineBox;
+	wxCheckBox		*_ckBoxOutlinePlane;
+	
+// EED Borrame
+//	wxCheckBox		*_ckBoxBackGroundBlack;
+	wxRadioButton	*_rdBackGroundBlack;
+	wxRadioButton	*_rdBackGroundWhite;
+	wxRadioButton	*_rdBackGroundGradient;
+	
+	wxCheckBox		*_ckBoxInterpolate;
 
 protected: