X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.h;h=5e145418c67106d564e33a79487b905346fbffe0;hb=e1c23d053ffe93035f13802efdb19dc116e4b46c;hp=5a194cc1bcf1e0e2028c7eacd3ec2e681130ff4e;hpb=65c158dc171f8d3114ee3544b2a94a1f41880df0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h
index 5a194cc..5e14541 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.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.
+# ------------------------------------------------------------------------ */
+
 /*!
  * @file buttonContainerController.h
  * @brief This contains the ButtonContainerController class
@@ -21,6 +46,8 @@
 #include "buttonGroupFactory.h"
 #include "containerSettings.h"
 #include "buttonContainerController.h"
+//EED-MLER #include "listGroup.h"
+//EED-MLER #include "listGroupFactory.h"
 
 /*!	@namespace <creaButtonContainer>
  *	@brief Contains the creaButtonContainer library included in creaMaracasVisu.
@@ -105,6 +132,17 @@ namespace creaButtonContainer
 				 */
 				typedef creaButtonContainer::controller::ButtonContainerController
 				    BCController;
+
+
+				//typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory;
+
+				//typedef creaButtonContainer::view::ListGroup ListGroup;
+
+				//typedef std::list< ListGroup* > ListGroupList;
+
+				//typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory;
+
+
 				// ----------------------------------------------------------------------------------
 				//end of typedef definition
 			public:
@@ -113,7 +151,7 @@ namespace creaButtonContainer
 				 * @param parent wxWindow pointer to parent.
 				 * @param settings ButtonGroupSettings Pointer to button container settings.
 				 */
-				ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings );
+				ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, int type );
 				// ----------------------------------------------------------------------------------
 				/*! @fn ~ButtonContainerPanel( );
 				 * @brief This is the destructor.
@@ -126,14 +164,18 @@ namespace creaButtonContainer
 				 * @param groupContainer
 				 */
 				void
-				SetGroupContainer( ButtonGroupList groupContainer );
+				SetButtonGroupContainer( ButtonGroupList groupContainer );
 				// ----------------------------------------------------------------------------------
 				/*! @fn PanelInit( );
 				 *	This method initializes the panel.
 				 *	@exception std::bad_alloc
 				 */
 				void
-				PanelInit( );
+				PanelInit( int type);
+				// ----------------------------------------------------------------------------------
+
+				//void
+				//SetListGroupContainer(ListGroupList groupContainer );
 				// ----------------------------------------------------------------------------------
 				/*! @fn FitSizer( );
 				 * This method fits and organizes the sizer.
@@ -144,10 +186,14 @@ namespace creaButtonContainer
 			public:
 				friend class creaButtonContainer::controller::ButtonContainerController;
 			private:
-				GroupManagerList m_GroupManagerList; //!<The container of managers.
-				ButtonGroupList m_ButtonGroupList; //!<The list of button groups.
-				BCController* m_ButtonCController; //!<Pontier to controller.
-				Sizer* m_Sizer; //!<Pointer to wxSizer
+				GroupManagerList 	m_GroupManagerList; //!<The container of managers.
+				ButtonGroupList 	m_ButtonGroupList; //!<The list of button groups.
+				BCController* 		m_ButtonCController; //!<Pontier to controller.
+				Sizer* 				m_Sizer; //!<Pointer to wxSizer
+
+
+				//ListGroupList m_ListGroupList;
+
 			DECLARE_EVENT_TABLE() //!<Event Table declaration.
 		};
 	}//ecapseman