X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCommandButton.cxx;h=5ad78e5b8110918aa62c4093daf11e9b7f730cf2;hb=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;hp=aeea2152e8e346e1150336ae1f39bd94faf64e61;hpb=857e5e5bd003d20cb8bc4539b6fca4ca9d50929c;p=bbtk.git

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index aeea215..5ad78e5 100644
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/15 08:02:37 $
-  Version:   $Revision: 1.8 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de 
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even 
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
@@ -33,8 +46,27 @@
 
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CommandButton);
-  
+
+
+   //--------------------------------------------------------------------------
+  class CommandButtonWidget : public wxPanel
+  {
+  public:
+    CommandButtonWidget(CommandButton* box, wxWindow *parent, 
+			wxString title);
+    ~CommandButtonWidget();
+    void OnCommandButton( wxEvent& );
+    void SetLabel(wxString title);
+    void SetColour(wxColour color);
+	
+  private:
+    CommandButton* mBox;
+    wxButton	*mwxCommandButton;
+  }; 
+   
+  //--------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
+
   CommandButtonWidget::CommandButtonWidget(CommandButton* box,
 					   wxWindow *parent, 
 					   wxString title )
@@ -51,7 +83,7 @@ namespace bbwx
 	     &CommandButtonWidget::OnCommandButton ); 
     
     wxFlexGridSizer *sizer	= new wxFlexGridSizer(1);
-    sizer -> Add( mwxCommandButton,1,wxGROW ); 
+    sizer -> Add( mwxCommandButton,1,wxGROW | wxALL,10 ); 
     sizer	-> AddGrowableCol(0);
     
     panel	-> SetSizer(sizer);
@@ -98,7 +130,7 @@ namespace bbwx
       std::string commandstr(mBox->bbGetInputIn());
     
     //	bbtk::Interpreter::mGlobalInterpreter->InterpretLine( commandstr );
-    int i;
+    unsigned int i;
     bool ok=true;
     int pos1=0,pos2;
     pos2 = commandstr.find(";",pos1);
@@ -153,25 +185,41 @@ namespace bbwx
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------- 
 
-
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CommandButton);
   BBTK_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
 
-  void CommandButton::bbUserConstructor() 
-  { 
-    bbSetInputIn("");
-    bbSetInputLabel("");
-    std::vector<double> lstColour;
-    lstColour.push_back(-1);
-    lstColour.push_back(-1);
-    lstColour.push_back(-1);
-    bbSetInputColour(lstColour);
-  }
-  
+//-----------------------------------------------------------------	
+	void CommandButton::bbUserSetDefaultValues()
+	{
+		bbSetInputIn("");
+		bbSetInputLabel("");
+		std::vector<double> lstColour;
+		lstColour.push_back(0.75);
+		lstColour.push_back(0.75);
+		lstColour.push_back(0.75);
+		bbSetInputColour(lstColour);
+		bbSetOutputWidget(0);
+	}
+	
+	//-----------------------------------------------------------------	
+	void CommandButton::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void CommandButton::bbUserFinalizeProcessing()
+	{
+	}
+	
   
   void CommandButton::Process() 
   { 
-    UpdateColour();
-    UpdateLabel();
+    CommandButtonWidget* w = (CommandButtonWidget*)bbGetOutputWidget();
+    if (w) 
+      {
+	UpdateColour();
+	UpdateLabel();
+      }
   }
   
   void CommandButton::UpdateColour()
@@ -192,6 +240,7 @@ namespace bbwx
     }
 
   } 
+	
   void CommandButton::UpdateLabel()
   {
     CommandButtonWidget* wxwidget = (CommandButtonWidget*)bbGetOutputWidget();
@@ -203,11 +252,12 @@ namespace bbwx
    * 
    * 
    */  
-  void CommandButton::CreateWidget() 
+  void CommandButton::CreateWidget(wxWindow* parent) 
   { 
     bbSetOutputWidget
-      ( new CommandButtonWidget ( this, bbGetWxParent(), 
-				  bbtk::std2wx(bbGetInputLabel()) ) );
+      ( new CommandButtonWidget ( this, //bbGetWxParent(), 
+								 parent,
+								 bbtk::std2wx(bbGetInputLabel()) ) );
     UpdateColour();
   }