X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FcontainerSettings.h;h=d00db70c51f3c8fbaa1f71d68443852f7490b6bc;hb=b2ac7f59e78e33f8e11065cffa2f2072aa9a9ee5;hp=8be486179452cd03c315f2ea756ea1679e0dc907;hpb=65c158dc171f8d3114ee3544b2a94a1f41880df0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
index 8be4861..d00db70 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.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 containerSettings.h
  * @brief Contains the ContainerSettings class
@@ -9,6 +34,8 @@
 #define BUTTONGROUPSETTINGS_H_
 
 #include <vector>
+#include <wx/bitmap.h>
+#include <wx/listctrl.h>
 
 #include "structBCSettings.h"
 #include "system.h"
@@ -16,6 +43,8 @@
 /*!	@namespace <creaButtonContainer>
  *	@brief Contains the creaButtonContainer library included in creaMaracasVisu.
  */
+
+
 namespace creaButtonContainer
 {
 	/*! @namespace <creaButtonContainer::model>
@@ -55,6 +84,7 @@ namespace creaButtonContainer
 				 */
 				virtual
 				~ContainerSettings( );
+				
 				// ----------------------------------------------------------------------------------
 				/*! @fn ButtonGroupMap ContainerSettings::GetButtonGroupContainer( )
 				 * 	@brief This method returns a container of buttons ordered by group.
@@ -69,6 +99,7 @@ namespace creaButtonContainer
 				 */
 				KeyMapList
 				GetGroupNameList( );
+				
 				// ----------------------------------------------------------------------------------
 				/*! void ContainerSettings::SetButtonGroupContainer( ButtonGroupMap m_ButtonGroupContainer )
 				 * 	@brief This method allows to create the ButtonGroupContainer.
@@ -83,6 +114,14 @@ namespace creaButtonContainer
 				 */
 				void
 				SetGroupNameList( KeyMapList gNameList );
+				
+				ListGroupMap
+				GetListGroupContainer( );
+
+				void
+				SetListGroupContainer( ListGroupMap lstContainer );
+
+
 				// ----------------------------------------------------------------------------------
 				/*!
 				 * @fn ContainerSettings::AddButton( const std::string & groupName, const std::string buttonName,
@@ -99,7 +138,7 @@ namespace creaButtonContainer
 				 */
 				void
 				AddButton( const StringType & groupName, const StringType &buttonName,
-				    const StringType &iconpath, const StringType &buttonDescription,
+				    const wxBitmap &icon, const StringType &buttonDescription,
 				    FunctionEventType event );
 				// ----------------------------------------------------------------------------------
 				/*! @fn void AddButton( BCSettingsStruct* info );
@@ -118,10 +157,24 @@ namespace creaButtonContainer
 				 */
 				void
 				AddButtons( BCStructVectorType infoList );
+
+				// ----------------------------------------------------------------------------------
+				void
+				AddItem(const StringType & groupName);
+
+				void
+				AddItem( BCSettingsStruct* info );
+
+				void
+				AddItems( BCStructVectorType infoList );
+
+				// ----------------------------------------------------------------------------------
 				// ----------------------------------------------------------------------------------
 			private:
 				ButtonGroupMap m_ButtonGroupContainer; //! <The container with the group of buttons.
 				KeyMapList m_GroupNameList; //! <The container with the name of the groups of buttons.
+
+				ListGroupMap m_ListGroupContainer; // contenedor del grupo de listas
 		};
 	}
 }