Program: bbtk
Module: $RCSfile: bbtkExecuter.cxx,v $
Language: C++
- Date: $Date: 2009/03/30 15:22:51 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2009/06/08 14:50:03 $
+ Version: $Revision: 1.31 $
=========================================================================*/
/* ---------------------------------------------------------------------
#include "bbtkMessageManager.h"
#include "bbtkFactory.h"
#include "bbtkUtilities.h"
+//#include "bbtkWx.h"
#include <fstream>
#ifdef USE_WXWIDGETS
//=======================================================================
Executer::Pointer Executer::New()
{
- bbtkDebugMessage("Kernel",9,"Executer::New()"<<std::endl);
+ bbtkDebugMessage("object",9,"Executer::New()"<<std::endl);
return MakePointer(new Executer());
}
//=======================================================================
mDialogMode(NoDialog),
mNoErrorMode(false)
{
- bbtkDebugMessageInc("Kernel",9,"Executer::Executer()" <<std::endl);
+ bbtkDebugMessage("object",2,"==> Executer()" <<std::endl);
mFactory = Factory::New();
// The smart pointer on this is not made yet (is made by New)
// -> create it to pass it to the factory
// -> this would auto-destroy !!
mFactory->SetExecuter(MakePointer(this,true));
Reset();
- bbtkDebugDecTab("Kernel",9);
+ bbtkDebugMessage("object",2,"<== Executer()" <<std::endl);
}
//=======================================================================
//=======================================================================
Executer::~Executer()
{
- bbtkDebugMessageInc("Kernel",9,"==> Executer::~Executer()" <<std::endl);
+ bbtkDebugMessage("object",2,"==> ~Executer()" <<std::endl);
mOpenDefinition.clear();
mOpenPackage.clear();
mFactory->Reset();
mFactory.reset();
- bbtkDebugDecTab("Kernel",9);
+ bbtkDebugMessage("object",2,"<== ~Executer()" <<std::endl);
}
//=======================================================================
//=======================================================================
void Executer::Reset()
{
- bbtkDebugMessageInc("Kernel",9,"Executer::Reset()" <<std::endl);
+ bbtkDebugMessage("kernel",9,"==> Executer::Reset()" <<std::endl);
- GetFactory()->CheckPackages();
+ // GetFactory()->Check();
mOpenDefinition.clear();
mOpenPackage.clear();
- GetFactory()->Reset();
+ // Wx::DestroyTopWindow();
+
+ GetFactory()->Reset();
+ Wx::ProcessPendingEvents();
+
// Create user package
Package::Pointer p =
Package::New("user","internal","User defined black boxes","");
r->AddToDescription("User's workspace");
mOpenDefinition.push_back(CBBDefinition(r,"user"));
// Register it into the user package
- p->RegisterBlackBox(r);
+ p->Register(r);
mRootCBB = r;
// Object::PrintObjectListInfo();
// GetFactory()->CheckPackages();
-
- bbtkDebugDecTab("Kernel",9);
+ bbtkDebugMessage("kernel",9,"<== Executer::Reset()" <<std::endl);
}
//=======================================================================
/// changes the workspace name
void Executer::SetWorkspaceName( const std::string& n )
{
- GetUserPackage()->ChangeBlackBoxName( GetWorkspace()->GetTypeName(), n );
+ GetUserPackage()->ChangeDescriptorName( GetWorkspace()->GetTypeName(), n );
}
//=======================================================================
//=======================================================================
void Executer::BeginPackage (const std::string &name)
{
- bbtkDebugMessageInc("Kernel",9,"Executer::BeginPackage(\""<<name<<"\")"
+ bbtkDebugMessage("kernel",9,"==> Executer::BeginPackage(\""<<name<<"\")"
<<std::endl);
Package::Pointer p;
try
GetFactory()->InsertPackage(p);
}
mOpenPackage.push_back(p);
+
+ bbtkDebugMessage("kernel",9,"<== Executer::BeginPackage(\""<<name<<"\")"
+ <<std::endl);
}
//=======================================================================
const std::string &pack,
const std::string &scriptfilename)
{
- bbtkDebugMessageInc("Kernel",9,"Executer::Define(\""<<name<<
- ","<<pack<<"\")"
- <<std::endl);
+ bbtkDebugMessage("kernel",9,"==> Executer::Define(\""<<name<<
+ ","<<pack<<"\")"
+ <<std::endl);
ComplexBlackBoxDescriptor::Pointer b
= ComplexBlackBoxDescriptor::New(name);
b->SetScriptFileName(scriptfilename);
mOpenDefinition.push_back( CBBDefinition( b, pack ) );
- bbtkDebugDecTab("Kernel",9);
+ bbtkDebugMessage("kernel",9,"<== Executer::Define(\""<<name<<
+ ","<<pack<<"\")"
+ <<std::endl);
}
//=======================================================================
//=======================================================================
void Executer::Clear()
{
- bbtkDebugMessageInc("Kernel",9,"Executer::Clear()" <<std::endl);
+ bbtkDebugMessage("kernel",9,"==> Executer::Clear()" <<std::endl);
GetCurrentDescriptor()->GetPrototype()->Clear();
-
+ bbtkDebugMessage("kernel",9,"<== Executer::Clear()" <<std::endl);
}
//=======================================================================
//=======================================================================
void Executer::EndDefine ()
{
- bbtkDebugMessageInc("Kernel",9,"Executer::EndDefine(\""
- <<GetCurrentDescriptor()->GetTypeName()<<"\")"
- <<std::endl);
+ bbtkDebugMessage("kernel",9,"==> Executer::EndDefine(\""
+ <<GetCurrentDescriptor()->GetTypeName()<<"\")"
+ <<std::endl);
// Does current package exist ?
Package::Pointer p;
std::string pname(mOpenDefinition.back().package);
{
p = mOpenPackage.back().lock();
}
- p->RegisterBlackBox(GetCurrentDescriptor());
+ // Register the descriptor in the current package
+ p->Register(GetCurrentDescriptor());
+ bbtkDebugMessage("kernel",9,"<== Executer::EndDefine(\""
+ <<GetCurrentDescriptor()->GetTypeName()<<"\")"
+ <<std::endl);
mOpenDefinition.pop_back();
}
//=======================================================================
}
//=======================================================================
+
+
//=======================================================================
/// prints the list of the boxes of the current descriptor
- void Executer::PrintBoxes()
+ void Executer::PrintHelpListBoxes()
{
- bbtkMessageInc("Help",1,"The black box descriptor \""
- <<GetCurrentDescriptor()->GetTypeName()<<"\" contains : "<<std::endl);
+ bbtkMessage("help",1,"The black box descriptor \""
+ <<GetCurrentDescriptor()->GetTypeName()<<"\" contains : "<<std::endl);
GetCurrentDescriptor()->PrintBlackBoxes();
- bbtkDecTab("Help",1);
}
//=======================================================================
}
else
{
- bbtkMessageInc("Help",1,"No black box: \""
- <<nameblackbox<<"\" " <<std::endl);
+ bbtkMessage("help",1,"No black box: \""
+ <<nameblackbox<<"\" " <<std::endl);
}
return page;
}
//=======================================================================
//=======================================================================
- void Executer::ShowRelations(const std::string &nameblackbox,
+ void Executer::PrintHelpBlackBox(const std::string &nameblackbox,
const std::string &detailStr,
const std::string &levelStr)
{
if (blackbox)
{
found=true;
- blackbox->bbShowRelations(blackbox,detail,level); //,mFactory);
+ blackbox->bbPrintHelp(blackbox,detail,level); //,mFactory);
}
if (!found)
{
- bbtkError("Blackbox Name not found.. <" <<nameblackbox<<">");
+ bbtkError("box with name '" <<nameblackbox<<"' unknown");
}
}
//=======================================================================
if (GetNoExecMode() && (GetCurrentDescriptor()==GetWorkspace()) ) return;
if (GetCurrentDescriptor()!=GetWorkspace()) return;
- bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<<str<<"\")"<<std::endl);
+ bbtkDebugMessage("kernel",9,"Executer::Print(\""<<str<<"\")"<<std::endl);
// TO DO :
// InterpretLine ("load std")
for (i= chains.begin(); i!=chains.end(); ++i)
{
Utilities::SubsBackslashN(*i);
- bbtkMessage("Output",1,*i);
+ bbtkMessage("output",1,*i);
}
- bbtkMessage("Output",1,std::endl);
+ bbtkMessage("output",1,std::endl);
}
//==========================================================================