X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=3056f05f3abba7b24c9eb6071a1d81c139f83241;hb=12f2166f201f4e5a99c9c7876dadd09da81bfb51;hp=20a7e441366668bd8d3b6558ec516da05e466a56;hpb=c1d78c47a2cb833842ceaecb9164b9d75fed9e99;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index 20a7e44..3056f05 100644
--- a/packages/wx/src/bbwxInputText.cxx
+++ b/packages/wx/src/bbwxInputText.cxx
@@ -1,33 +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.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/04/08 14:36:32 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -52,6 +57,9 @@ namespace bbwx
     ~InputTextWidget();
 
     std::string GetValue();
+	void SetValue(std::string value);
+
+    void OnTextEnter(wxCommandEvent& event);
     void OnTextUpdate(wxCommandEvent& event);
 
     void SetTitle(wxString);
@@ -75,28 +83,25 @@ namespace bbwx
   {
     wxPanel			*panel	= this;
     
-    mwxTextCtrl = new wxTextCtrl( panel, -1, In,
-				  wxDefaultPosition, wxSize(800,20));
+    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(800,20),wxTE_PROCESS_ENTER);
+    Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER, 
+	     (wxObjectEventFunction) 
+	     (wxEventFunction)
+	     (wxCommandEventFunction) 
+	     (void (wxPanel::*)(wxCommandEvent&))
+	     &InputTextWidget::OnTextEnter ); 
 
-    // The following was supposed to generate an event, only on ENTER key ...
-    // ... but nothing happens (no event at all ?!?)			  
-    //Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER,
-    
-     Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_UPDATED,     
+    Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_UPDATED, 
 	     (wxObjectEventFunction) 
 	     (wxEventFunction)
 	     (wxCommandEventFunction) 
 	     (void (wxPanel::*)(wxCommandEvent&))
 	     &InputTextWidget::OnTextUpdate ); 
 
+
     wxFlexGridSizer *sizer	= new wxFlexGridSizer(1);
-    /*
-      if (title!=_T(""))
-      {
-    */
     mwxTitle = new wxStaticText(panel, -1, title ); 
     sizer-> Add( mwxTitle ); 
-    //	  }
     sizer-> Add( mwxTextCtrl, 1, wxGROW ); 
     sizer-> AddGrowableCol(0);
     
@@ -124,15 +129,33 @@ namespace bbwx
   { 
     return bbtk::wx2std ( mwxTextCtrl->GetValue() );
   }
-
+	
+  void InputTextWidget::SetValue(std::string value)
+  { 
+	mwxTextCtrl->SetValue( bbtk::std2wx(value) ) ;
+  }
+	
   //--------------------------------------------------------------------------
   void InputTextWidget::OnTextUpdate(wxCommandEvent& event)
   {
-    mBox->bbSetOutputOut( GetValue() );
-    mBox->bbSetInputIn( GetValue() );
-    mBox->bbSignalOutputModification("Out");
+	if (mBox->bbGetInputReactiveOnKeystroke()==2){
+	    mBox->bbSetOutputOut( GetValue() );
+	    mBox->bbSetInputIn( GetValue() );
+	    mBox->bbSignalOutputModification("Out");
+	}
+  }
+
+  //--------------------------------------------------------------------------
+  void InputTextWidget::OnTextEnter(wxCommandEvent& event)
+  {
+	if (mBox->bbGetInputReactiveOnKeystroke()==1){
+	    mBox->bbSetOutputOut( GetValue() );
+		mBox->bbSetInputIn( GetValue() );
+		mBox->bbSignalOutputModification("Out");
+	}
   }
 
+
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------
   //--------------------------------------------------------------------------
@@ -145,9 +168,11 @@ namespace bbwx
 	//-----------------------------------------------------------------	
 	void InputText::bbUserSetDefaultValues()
 	{
+		firsttime=true;
 		bbSetInputTitle("");
 		bbSetInputIn("");
 		bbSetOutputWidget(0);
+		bbSetInputReactiveOnKeystroke(2);
 	}
 	
 	//-----------------------------------------------------------------	
@@ -167,10 +192,16 @@ namespace bbwx
     InputTextWidget *w=(InputTextWidget *)bbGetOutputWidget();
 	if (w) 
 	{
-		bbSetInputIn( w->GetValue() );
+		if (firsttime==true)
+		{
+			firsttime=false;
+			w->SetValue(  bbGetInputIn().c_str() );
+		}
 		w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
+		bbSetOutputOut( w->GetValue() );
+	} else {
+	  bbSetOutputOut( "<VOID>" );
 	}
-	bbSetOutputOut( bbGetInputIn() );
   }