X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCommandButton.cxx;h=e216d9904ad0efc8ab52ac0ed2c306e1a82901ff;hb=5196156e0ab3bdf5ea8205d9cbccf558ca3004ad;hp=9b39118b2bf63fc395bd1af88bc53673f7c8f08f;hpb=2593029cb1c4a272c6502cc9abc82f980d479739;p=bbtk.git diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx index 9b39118..e216d99 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/03/19 12:26:09 $ - Version: $Revision: 1.4 $ - - 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: 2008/12/12 08:55:23 $ + Version: $Revision: 1.14 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 @@ -27,13 +40,33 @@ #include "bbwxCommandButton.h" #include "bbwxPackage.h" #include "bbtkInterpreter.h" +#include "bbtkExecuter.h" 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 ) @@ -50,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); @@ -66,29 +99,38 @@ namespace bbwx 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); @@ -111,8 +153,7 @@ namespace bbwx ccommand[i]=34; // " } } - bool insideComment = false; // for multiline comment - I->InterpretLine( ccommand, insideComment ); + I->InterpretLine( ccommand ); pos1=pos2+1; pos2 = commandstr.find(";",pos2+1); @@ -144,25 +185,30 @@ namespace bbwx //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- - - BBTK_USER_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox); + BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CommandButton); + BBTK_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); + lstColour.push_back(0.75); + lstColour.push_back(0.75); + lstColour.push_back(0.75); bbSetInputColour(lstColour); + bbSetOutputWidget(0); } void CommandButton::Process() { - UpdateColour(); - UpdateLabel(); + CommandButtonWidget* w = (CommandButtonWidget*)bbGetOutputWidget(); + if (w) + { + UpdateColour(); + UpdateLabel(); + } } void CommandButton::UpdateColour() @@ -194,11 +240,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(); }