Program: bbtk
Module: $RCSfile: bbwxCommandButton.cxx,v $
Language: C++
- Date: $Date: 2008/04/18 12:59:52 $
- Version: $Revision: 1.7 $
+ 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
&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);
void CommandButtonWidget::OnCommandButton( wxEvent& )
{
- // Look for the interpreter
+ // Look for the interpreter or the executer if no interpreter
bbtk::Interpreter::Pointer I;
+ bbtk::VirtualExec::Pointer E;
if (mBox->bbGetParent() != 0)
{
bbtk::Factory::Pointer f = boost::dynamic_pointer_cast<bbtk::ComplexBlackBoxDescriptor>(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 = bbtk::Interpreter::New();
+ // 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);
bbSetInputIn("");
bbSetInputLabel("");
std::vector<double> 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);
}