X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=66058c39062b91b7dfaa87d00eaa4beb6b34e020;hb=315c4b62d90c40f8cccd821a5ba961bf51367bb0;hp=e9e2ab737f876eb5a7ce97a149d2be6164ed5125;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index e9e2ab7..66058c3 100644
--- a/packages/wx/src/bbwxInputText.cxx
+++ b/packages/wx/src/bbwxInputText.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2011/07/22 12:30:31 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -33,23 +33,42 @@
  *  \brief 
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
-
 #include "bbwxInputText.h"
 #include "bbwxPackage.h"
 //#include <wx/dialog.h>
 
 
-	
-
-
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,InputText);
-  
+ 
+  //--------------------------------------------------------------------------
+  class InputTextWidget : wxPanel
+  {
+  public:
+    InputTextWidget(InputText* box, wxWindow *parent,
+		    wxString In, wxString title);
+    ~InputTextWidget();
+
+    std::string GetValue();
+	void SetValue(std::string value);
+
+    void OnTextEnter(wxCommandEvent& event);
+    void OnTextUpdate(wxCommandEvent& event);
+
+    void SetTitle(wxString);
+
+  private:
+    InputText    *mBox;
+    wxTextCtrl	 *mwxTextCtrl;
+    wxStaticText *mwxTitle;
+  };
   
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+
   InputTextWidget::InputTextWidget(InputText* box,
 				   wxWindow *parent, 
 				   wxString In, 
@@ -59,30 +78,31 @@ 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 ); 
+
     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);
+    mwxTitle = new wxStaticText(panel, -1, title ); 
+    sizer-> Add( mwxTitle ); 
+    sizer-> Add( mwxTextCtrl, 1, wxGROW ); 
+    sizer-> AddGrowableCol(0);
     
-    panel	-> SetSizer(sizer);
-    panel	-> SetAutoLayout(true);
-    panel	-> Layout();
+    panel-> SetSizer(sizer);
+    panel-> SetAutoLayout(true);
+    panel-> Layout();
 
   }
   //-------------------------------------------------------------------------
@@ -104,54 +124,92 @@ 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");
+	}
+  }
+
+
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------
   //--------------------------------------------------------------------------
   //--------------------------------------------------------------------------
 
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, InputText);
+  BBTK_BLACK_BOX_IMPLEMENTATION(InputText, bbtk::WxBlackBox);
 
-  BBTK_BLACK_BOX_IMPLEMENTATION(InputText,bbtk::WxBlackBox);
-
-
-
-  void InputText::bbUserConstructor() 
-  { 
-    bbSetInputTitle("");
-    bbSetInputIn("");
-  }
   
+	//-----------------------------------------------------------------	
+	void InputText::bbUserSetDefaultValues()
+	{
+		firsttime=true;
+		bbSetInputTitle("");
+		bbSetInputIn("");
+		bbSetOutputWidget(0);
+		bbSetInputReactiveOnKeystroke(2);
+	}
+	
+	//-----------------------------------------------------------------	
+	void InputText::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void InputText::bbUserFinalizeProcessing()
+	{
+	}
 
+	
+	//-----------------------------------------------------------------	
   void InputText::Process() 
   { 
     InputTextWidget *w=(InputTextWidget *)bbGetOutputWidget();
-    bbSetInputIn( w->GetValue() );
-    bbSetOutputOut( w->GetValue() );
-    w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
+	if (w) 
+	{
+		if (firsttime==true)
+		{
+			firsttime=false;
+			w->SetValue(  bbGetInputIn().c_str() );
+		}
+		w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
+		bbSetOutputOut( w->GetValue() );
+	} else {
+	  bbSetOutputOut( "<VOID>" );
+	}
   }
   
 
 
-  void InputText::CreateWidget()
+  void InputText::CreateWidget(wxWindow* parent)
   {
     bbSetOutputWidget
-      ( (wxWindow*) new InputTextWidget(this, bbGetWxParent(),
+      ( (wxWindow*) new InputTextWidget(this, //bbGetWxParent(),
+					parent,
 					bbtk::std2wx ( bbGetInputIn() ) , 
-					bbtk::std2wx ( bbGetInputTitle() ) ) );
-	
+					bbtk::std2wx ( bbGetInputTitle() ) ) );	
   }
 
-
-
-
 }//namespace bbtk
 
 #endif // _USE_WXWIDGETS_