X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=3056f05f3abba7b24c9eb6071a1d81c139f83241;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=7aaeeff92d4399bc60699d53e906ee88262d65ac;hpb=c36a2bfde9a41c762773e0933e662be57c3ceaa0;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index 7aaeeff..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/09 14:02:15 $
-  Version:   $Revision: 1.10 $
+  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,8 @@ namespace bbwx
     ~InputTextWidget();
 
     std::string GetValue();
+	void SetValue(std::string value);
+
     void OnTextEnter(wxCommandEvent& event);
     void OnTextUpdate(wxCommandEvent& event);
 
@@ -122,7 +129,12 @@ namespace bbwx
   { 
     return bbtk::wx2std ( mwxTextCtrl->GetValue() );
   }
-
+	
+  void InputTextWidget::SetValue(std::string value)
+  { 
+	mwxTextCtrl->SetValue( bbtk::std2wx(value) ) ;
+  }
+	
   //--------------------------------------------------------------------------
   void InputTextWidget::OnTextUpdate(wxCommandEvent& event)
   {
@@ -156,6 +168,7 @@ namespace bbwx
 	//-----------------------------------------------------------------	
 	void InputText::bbUserSetDefaultValues()
 	{
+		firsttime=true;
 		bbSetInputTitle("");
 		bbSetInputIn("");
 		bbSetOutputWidget(0);
@@ -179,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() );
   }