X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCommandButton.cxx;h=206d90c4774c8690ceef2572c61fd86231229001;hb=5028ffe24ceaf78dca61c8e4ab67c36db771a7d8;hp=7a9352ee60ba3fe452f0aa636b293857d7d6a171;hpb=e6b2de923e0e69c303c7d18fb8a5c1970541bb3a;p=bbtk.git

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index 7a9352e..206d90c 100644
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -1,20 +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: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/07/25 07:44:12 $
-  Version:   $Revision: 1.10 $
-                                                                                
-  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: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.16 $
 =========================================================================*/
+
 /**
  *  \file 
  *  \brief 
@@ -33,38 +51,51 @@
 
 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 )
     : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
       mBox(box)
   { 
-
     wxPanel *panel	= this;
-
     mwxCommandButton = new wxButton( panel, -1, title);
     Connect( mwxCommandButton->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , 
 	     (wxObjectEventFunction) 
 	     (void (wxPanel::*)(wxEvent&))
 	     &CommandButtonWidget::OnCommandButton ); 
-    
     wxFlexGridSizer *sizer	= new wxFlexGridSizer(1);
     sizer -> Add( mwxCommandButton,1,wxGROW | wxALL,10 ); 
     sizer	-> AddGrowableCol(0);
-    
     panel	-> SetSizer(sizer);
     panel	-> SetAutoLayout(true);
     panel	-> Layout();
-    
   }
   
   CommandButtonWidget::~CommandButtonWidget()
   {
   }
   
-  
   void CommandButtonWidget::OnCommandButton( wxEvent& )
   {
     // Look for the interpreter or the executer if no interpreter
@@ -123,27 +154,25 @@ namespace bbwx
 	  }		
 	I->InterpretLine( ccommand );
 	pos1=pos2+1;
-	pos2 = commandstr.find(";",pos2+1);
-	
+	pos2 = commandstr.find(";",pos2+1);	
       }
-   
     mBox->UpdateLabel();
     mBox->UpdateColour();
     mBox->bbSignalOutputModification();
   }
 
-  
-  //--------------------------------------------------------------------------
-  
+  //--------------------------------------------------------------------------  
   void CommandButtonWidget::SetLabel(wxString title)
   {
     mwxCommandButton->SetLabel(title);
   }
+
   //--------------------------------------------------------------------------
-  
   void CommandButtonWidget::SetColour(wxColour color)
   {
     mwxCommandButton->SetBackgroundColour(color);
+	mwxCommandButton->Refresh();
+	mwxCommandButton->ClearBackground();
   }
 
 
@@ -153,25 +182,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(0.75);
-    lstColour.push_back(0.75);
-    lstColour.push_back(0.75);
-    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()
@@ -182,16 +227,14 @@ namespace bbwx
 	  (bbGetInputColour()[2]==-1) )
       {
 	wxwidget->SetColour( wxwidget->GetParent()->GetBackgroundColour() );
-      } 
-    else 
-      {
+      }  else  {
       int r=(int) (255*bbGetInputColour()[0]);
       int g=(int) (255*bbGetInputColour()[1]);
       int b=(int) (255*bbGetInputColour()[2]);
       wxwidget->SetColour( wxColour(r,g,b) );
     }
-
   } 
+	
   void CommandButton::UpdateLabel()
   {
     CommandButtonWidget* wxwidget = (CommandButtonWidget*)bbGetOutputWidget();
@@ -203,11 +246,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();
   }