X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuPanelButtonContainerSettings.h;h=52579c613215333bce99a0e0b502d8e26f0f9a88;hb=9efc4d8bf8fa16e76153eb2efccc5057a79f3d29;hp=9db1bd99d16f87e970a98be86003cddac75ee137;hpb=42ab109aa8896b41a401e00e8595acf2bd1d3a92;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.h b/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.h
index 9db1bd9..52579c6 100644
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.h
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.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.
+# ------------------------------------------------------------------------ */
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
@@ -6,15 +31,17 @@
 #define __bbcreaMaracasVisuPanelButtonContainerSettings_h_INCLUDED__
 #include "bbcreaMaracasVisu_EXPORT.h"
 #include "bbtkWxBlackBox.h"
+#include "wx/bitmap.h"
 
 #include <string>
 #include <vector>
 
-#include <structButtonContainerSettings.h>
+#include <structBCPSettings.h>
 
 namespace bbcreaMaracasVisu
 {
-	typedef std::vector< BCSettingsStruct* > BCStructVectorType;
+	typedef creaPanelButtonContainer::BCPSettingsStruct BCPSettingsStruct;
+	typedef std::vector< BCPSettingsStruct* > BCStructVectorType;
 	class bbcreaMaracasVisu_EXPORT PanelButtonContainerSettings :
 	  public bbtk::WxBlackBox
 	{
@@ -27,9 +54,11 @@ namespace bbcreaMaracasVisu
 			BBTK_DECLARE_INPUT(GroupName,std::string);
 			BBTK_DECLARE_INPUT(ButtonName,std::string);
 			BBTK_DECLARE_INPUT(Iconpath,std::string);
+			BBTK_DECLARE_INPUT(Icon,wxBitmap);
 			BBTK_DECLARE_INPUT(ButtonDescription,std::string);
 			BBTK_DECLARE_INPUT(Widget,wxWindow*);
 			BBTK_DECLARE_OUTPUT(Out,BCStructVectorType);
+			BBTK_DECLARE_OUTPUT(Settings,BCPSettingsStruct*);
 			BBTK_PROCESS(Process);
 
 			void
@@ -38,7 +67,7 @@ namespace bbcreaMaracasVisu
 			CreateWidget( wxWindow* );
 
 		private:
-			BCSettingsStruct* m_BSettings;
+			BCPSettingsStruct* m_BSettings;
 			BCStructVectorType m_BCSettingsVector;
 			wxPanel* myPanel;
 			//=====
@@ -56,9 +85,11 @@ namespace bbcreaMaracasVisu
 	BBTK_INPUT(PanelButtonContainerSettings,GroupName,"Group Name",std::string,"");
 	BBTK_INPUT(PanelButtonContainerSettings,ButtonName,"Button Name",std::string,"");
 	BBTK_INPUT(PanelButtonContainerSettings,Iconpath,"The path of the Icon",std::string,"");
+	BBTK_INPUT(PanelButtonContainerSettings,Icon,"The Icon",wxBitmap,"");
 	BBTK_INPUT(PanelButtonContainerSettings,ButtonDescription,"Full description of the button",std::string,"");
 	BBTK_INPUT(PanelButtonContainerSettings,Widget,"Panel associated to the button",wxWindow*,"");
 	BBTK_OUTPUT(PanelButtonContainerSettings,Out,"ButtonContainerSettings List",BCStructVectorType,"");
+	BBTK_OUTPUT(PanelButtonContainerSettings,Settings,"ButtonContainerSettings",BCPSettingsStruct*,"");
 	BBTK_END_DESCRIBE_BLACK_BOX(PanelButtonContainerSettings);
 	//=====
 	// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)