X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FcontainerSettings.cxx;h=836e5e0487bb596b20673e57c6c2a956673ca4d2;hb=4518d93a0a51221812cfb6d783f8e7f4fd77b498;hp=a85aff5c7f58a862258c2266a2a3c5bf709d44f6;hpb=65c158dc171f8d3114ee3544b2a94a1f41880df0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
index a85aff5..836e5e0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
@@ -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.cxx
  * @brief Implements the ContainerSettings class.
@@ -19,6 +44,7 @@ namespace creaButtonContainer
 		ContainerSettings::~ContainerSettings( )
 		{
 		}
+		
 		// ----------------------------------------------------------------------------------
 		ButtonGroupMap
 		ContainerSettings::GetButtonGroupContainer( )
@@ -31,9 +57,10 @@ namespace creaButtonContainer
 		{
 			return ( this->m_GroupNameList );
 		}
+		
 		// ----------------------------------------------------------------------------------
 		void
-		ContainerSettings::SetButtonGroupContainer( ButtonGroupMap bgContainer )
+		ContainerSettings::SetButtonGroupContainer(ButtonGroupMap bgContainer)
 		{
 			this->m_ButtonGroupContainer = bgContainer;
 		}
@@ -43,14 +70,21 @@ namespace creaButtonContainer
 		{
 			this->m_GroupNameList = gNameList;
 		}
+		
 		// ----------------------------------------------------------------------------------
+
+
 		void
 		ContainerSettings::AddButton( const StringType & groupName,
-		    const StringType &buttonName, const StringType &iconpath,
+		    const StringType &buttonName, const wxBitmap &icon,
 		    const StringType &buttonDescription, FunctionEventType event )
 		{
+			std::cout<< std::endl<<"MLER CLASS : ContainerSettings" << std::endl;
+			std::cout<< std::endl<<"MLER ContainerSettings // AddButton "<<std::endl;
+
+
 			ButtonPair* pair = new ButtonPair(
-			    new ButtonInfo( buttonName, iconpath ),
+			    new ButtonInfo( buttonName, icon ),
 			    new ButtonAction( buttonDescription, event ) );
 			try
 			{
@@ -59,6 +93,8 @@ namespace creaButtonContainer
 				{
 					if ( ( *it ).compare( groupName ) == 0 )
 					{
+						std::cout<<"MLER ContainerSettings // AddButton : it "<<*it <<std::endl;
+
 						this->m_ButtonGroupContainer[ groupName ].push_back( pair );
 						return;
 					}//fi
@@ -80,7 +116,7 @@ namespace creaButtonContainer
 		ContainerSettings::AddButton( BCSettingsStruct* info )
 		{
 			ButtonPair* pair = new ButtonPair(
-			    new ButtonInfo( info->buttonName, info->iconpath ),
+			    new ButtonInfo( info->buttonName, info->icon ),
 			    new ButtonAction( info->buttonDescription, info->eventFunction ) );
 			try
 			{
@@ -122,6 +158,8 @@ namespace creaButtonContainer
 				    << "exception: " << e.what( ) << std::endl;
 			}//hctac
 		}
+
+
 	// ----------------------------------------------------------------------------------
 	}//ecapseman
 }//ecapseman