X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwx%2Fsrc%2FbbwxLayoutTab.h;h=f00c62e4ecbb88dfb0a4d9980c5e70ecf2c2c43f;hb=31e2f200e025912534be06735c258e2b41285a28;hp=68278531bed0903b463f9152d0687cf39c52b138;hpb=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutTab.h b/packages/wx/src/bbwxLayoutTab.h
index 6827853..f00c62e 100644
--- a/packages/wx/src/bbwxLayoutTab.h
+++ b/packages/wx/src/bbwxLayoutTab.h
@@ -1,20 +1,40 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
-                                                                                
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/08 06:59:32 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
-=========================================================================*//**
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.12 $
+=========================================================================*/
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -39,17 +59,13 @@
 #include "bbtkWxBlackBox.h"
 #include <wx/notebook.h>
 
+#include "bbwx_EXPORT.h"
 
 namespace bbwx
 {
-  
-
-  
-  
-  class /*BBTK_EXPORT*/ LayoutTab : public bbtk::WxBlackBox
+  class bbwx_EXPORT LayoutTab : public bbtk::WxBlackBox
   {
-    
-    BBTK_USER_BLACK_BOX_INTERFACE(LayoutTab,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(LayoutTab,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(Widget1,wxWindow*);
     BBTK_DECLARE_INPUT(Widget2,wxWindow*);
     BBTK_DECLARE_INPUT(Widget3,wxWindow*);
@@ -60,25 +76,24 @@ namespace bbwx
     BBTK_DECLARE_INPUT(Widget8,wxWindow*);
     BBTK_DECLARE_INPUT(Widget9,wxWindow*);
     BBTK_DECLARE_INPUT(Orientation,std::string);
+    BBTK_DECLARE_OUTPUT(Selection,int); 
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
-    
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
     void Process();
-    void CreateWidget();
-    
+    void CreateWidget(wxWindow*);
+    void OnShowWidget();
   protected:
-	virtual void bbUserConstructor();
-	void TryInsertWindow(wxNotebook *book, wxWindow *widgetchild);
-
+    void SetTitleTabs();
+    void TryInsertWindow(wxNotebook *book, const std::string& input);
   };
   
- 
 //=================================================================
 // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutTab,bbtk::WxBlackBox);
   BBTK_NAME("LayoutTab");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("LayoutTab widget (wxNotebook)");
+  BBTK_DESCRIPTION("(C++, Python) LayoutTab widget (wxNotebook) The label of each 'note book'  will be the name of the object it contains");
     // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
     BBTK_INPUT(LayoutTab,Widget1,"widget 1",wxWindow*,"");
     BBTK_INPUT(LayoutTab,Widget2,"widget 2",wxWindow*,"");
@@ -92,6 +107,8 @@ namespace bbwx
     BBTK_INPUT(LayoutTab,Orientation,
 	       "Orientation (default T), 0=T=TOP , 1=R=RIGHT , 2=B=BOTTON , 3=L=LEFT " 
 	       ,std::string,"");
+	BBTK_OUTPUT(LayoutTab,Selection,"Tab selection",int,""); 
+
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutTab);
   //=================================================================