X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCommandButton.cxx;h=206d90c4774c8690ceef2572c61fd86231229001;hb=5028ffe24ceaf78dca61c8e4ab67c36db771a7d8;hp=2b943b2edbf278d48c3cd512f8bbf58b6638a3bf;hpb=05e7ead34117d7cd9946e02dfc6a4f1079630f4f;p=bbtk.git diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx index 2b943b2..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/03/26 14:47:37 $ - Version: $Revision: 1.6 $ - - 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,63 +51,85 @@ 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 ); + 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 - bbtk::Interpreter* I = 0; + // Look for the interpreter or the executer if no interpreter + bbtk::Interpreter::Pointer I; + bbtk::VirtualExec::Pointer E; if (mBox->bbGetParent() != 0) { - bbtk::Factory* f = - ((bbtk::ComplexBlackBoxDescriptor*)mBox->bbGetParent() - ->bbGetDescriptor())->GetFactory(); + bbtk::Factory::Pointer f = boost::dynamic_pointer_cast(mBox->bbGetParent()->bbGetDescriptor())->GetFactory(); if ((f != 0)&& (f->GetExecuter())) { - I = f->GetExecuter()->GetInterpreter(); + E = f->GetExecuter(); + I = E->GetInterpreter(); } } if (I==0) { - // bbtkError("ExecBbiCommand::DoProcess() : could not find interpreter"); - I = new bbtk::Interpreter(); + // bbtkError("CommandButton::DoProcess() : could not find interpreter"); + if (E==0) + { + // If no executer : create a totally independant interpreter + I = bbtk::Interpreter::New(); + } + else + { + // If executer : create an interpreter using E + I = bbtk::Interpreter::New(E); + } } 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); @@ -114,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(); } @@ -144,25 +182,41 @@ namespace bbwx //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- + BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CommandButton); + BBTK_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox); - BBTK_USER_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox); - - void CommandButton::bbUserConstructor() - { - bbSetInputIn(""); - bbSetInputLabel(""); - std::vector lstColour; - lstColour.push_back(-1); - lstColour.push_back(-1); - lstColour.push_back(-1); - bbSetInputColour(lstColour); - } - +//----------------------------------------------------------------- + void CommandButton::bbUserSetDefaultValues() + { + bbSetInputIn(""); + bbSetInputLabel(""); + std::vector 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() @@ -173,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(); @@ -194,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(); }