Program: bbtk
Module: $RCSfile: bbwxCommandButton.cxx,v $
Language: C++
- Date: $Date: 2008/03/10 06:24:13 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2008/05/15 08:02:37 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "bbwxCommandButton.h"
#include "bbwxPackage.h"
#include "bbtkInterpreter.h"
+#include "bbtkExecuter.h"
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<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 = 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());
}
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
- I->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()
{