X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=3056f05f3abba7b24c9eb6071a1d81c139f83241;hb=f9574f4d8fb212474d38c304002a493051c7b579;hp=48ba722ab09b015aeb4660c26ece0e2ef422f082;hpb=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;p=bbtk.git diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx index 48ba722..3056f05 100644 --- a/packages/wx/src/bbwxInputText.cxx +++ b/packages/wx/src/bbwxInputText.cxx @@ -1,57 +1,53 @@ -/*========================================================================= +/* + # --------------------------------------------------------------------- + # + # 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: 2009/05/15 14:58:03 $ - Version: $Revision: 1.6 $ + 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 */ - #ifdef _USE_WXWIDGETS_ - #include "bbwxInputText.h" #include "bbwxPackage.h" //#include - - - namespace bbwx { - - - - - + //-------------------------------------------------------------------------- class InputTextWidget : wxPanel { @@ -61,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,9 +74,6 @@ namespace bbwx //------------------------------------------------------------------------ //------------------------------------------------------------------------ - - - InputTextWidget::InputTextWidget(InputText* box, wxWindow *parent, wxString In, @@ -87,30 +83,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(); } //------------------------------------------------------------------------- @@ -132,30 +129,50 @@ 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_ADD_BLACK_BOX_TO_PACKAGE(wx, InputText); + BBTK_BLACK_BOX_IMPLEMENTATION(InputText, bbtk::WxBlackBox); //----------------------------------------------------------------- void InputText::bbUserSetDefaultValues() { + firsttime=true; bbSetInputTitle(""); bbSetInputIn(""); bbSetOutputWidget(0); + bbSetInputReactiveOnKeystroke(2); } //----------------------------------------------------------------- @@ -175,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( "" ); } - bbSetOutputOut( bbGetInputIn() ); } @@ -187,15 +210,11 @@ namespace bbwx { bbSetOutputWidget ( (wxWindow*) new InputTextWidget(this, //bbGetWxParent(), - parent, - bbtk::std2wx ( bbGetInputIn() ) , - bbtk::std2wx ( bbGetInputTitle() ) ) ); - + parent, + bbtk::std2wx ( bbGetInputIn() ) , + bbtk::std2wx ( bbGetInputTitle() ) ) ); } - - - }//namespace bbtk #endif // _USE_WXWIDGETS_