X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.h;h=6eb1480e50ac953d155325a6f835809051cdf425;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=f71adf17a4147dde30e5f095ba0228cb7c0fe74a;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h
index f71adf1..6eb1480 100644
--- a/packages/wx/src/bbwxInputText.h
+++ b/packages/wx/src/bbwxInputText.h
@@ -1,34 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbwxInputText.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */                                                                         
-
-
 /**
  * \brief Short description in one line
  * 
@@ -44,7 +48,6 @@
  * \brief Pattern for the definition of a new type of Node 
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
 
@@ -53,77 +56,48 @@
 
 #include "bbtkWxBlackBox.h"
 
-
+#include "bbwx_EXPORT.h"
 
 namespace bbwx
 {
-  
-  
-  
-  
-  class InputText;
-  
-  //--------------------------------------------------------------------------
-  class InputTextWidget : wxPanel
-  {
-  public:
-    InputTextWidget(InputText* box, wxWindow *parent,
-		    wxString In, wxString title);
-    ~InputTextWidget();
 
-    std::string GetValue();
-    void OnTextUpdate(wxCommandEvent& event);
-
-    void SetTitle(wxString);
-
-  private:
-    InputText    *mBox;
-    wxTextCtrl	 *mwxTextCtrl;
-    wxStaticText *mwxTitle;
-  };
-  
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-
-  
-  
-  
-  
-  class /*BBTK_EXPORT*/ InputText : public bbtk::WxBlackBox
+  //=================================================================
+  class bbwx_EXPORT InputText : public bbtk::WxBlackBox
   {
     
     BBTK_BLACK_BOX_INTERFACE(InputText,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_INPUT(Title,std::string);
+    BBTK_DECLARE_INPUT(ReactiveOnKeystroke,int);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
     void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
     
+  private:
+	  bool firsttime;
   protected:
-    virtual void bbUserConstructor();
+
   };
-  
- 
   //=================================================================
-  // UserBlackBox description
+
+  //=================================================================
+  // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(InputText,bbtk::WxBlackBox);
   BBTK_NAME("InputText");
   BBTK_AUTHOR("laurent guigues at creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("A zone in which the user can enter a text (wxTextCtrl)");
   BBTK_INPUT(InputText,In,"Initial text (default '')",std::string,"");
 
-  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ",
-	     std::string,"");
+  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ", std::string,"");
+  BBTK_INPUT(InputText,ReactiveOnKeystroke,"0 not event generated, 1 Enter event genereated, 2 All keys, (default '2') ", int,"");
 
   BBTK_OUTPUT(InputText,Out,"Current text",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(InputText);
+ 
   //=================================================================
 
-
-
 }
 
 
@@ -131,4 +105,4 @@ namespace bbwx
 //namespace bbtk
 #endif  //__bbWxInputText_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS