Program: bbtk
Module: $RCSfile: bbwxCommandButton.cxx,v $
Language: C++
- Date: $Date: 2008/02/15 12:47:17 $
- Version: $Revision: 1.1 $
+ 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
+ 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.
#include "bbwxCommandButton.h"
#include "bbwxPackage.h"
#include "bbtkInterpreter.h"
+#include "bbtkExecuter.h"
&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& )
{
- std::string commandstr(mBox->bbGetInputIn());
+ // 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()))
+ {
+ E = f->GetExecuter();
+ I = E->GetInterpreter();
+ }
+ }
+ if (I==0)
+ {
+ // 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);
}
for ( i=0 ; i < ccommand.length() ; i++)
{
- if (ccommand[i]==39)
+ if (ccommand[i]==39) // '
{
- ccommand[i]=34;
+ ccommand[i]=34; // "
}
}
- bool insideComment = false; // for multiline comment
- bbtk::Interpreter::mGlobalInterpreter->InterpretLine( ccommand, insideComment );
+ I->InterpretLine( ccommand );
pos1=pos2+1;
pos2 = commandstr.find(";",pos2+1);
//--------------------------------------------------------------------------
- BBTK_USER_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
+ 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);
+ lstColour.push_back(0.75);
+ lstColour.push_back(0.75);
+ lstColour.push_back(0.75);
bbSetInputColour(lstColour);
}