X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=ee60d2e992e98ea035c9615581be167c7e39777b;hb=d7a6d341e2d11c175351212f0bf4812784dc57e5;hp=891b6aa6b016ff41b83880d135726d3bc1619346;hpb=40b39757a6f9d5056bc08a59081ed19d0406837f;p=bbtk.git diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx index 891b6aa..ee60d2e 100644 --- a/kernel/src/bbtkExecuter.cxx +++ b/kernel/src/bbtkExecuter.cxx @@ -1,30 +1,29 @@ /*========================================================================= - + Program: bbtk Module: $RCSfile: bbtkExecuter.cxx,v $ $ Language: C++ - Date: $Date: 2008/01/28 15:08:53 $ - Version: $Revision: 1.2 $ - + Date: $Date: 2008/04/22 06:59:31 $ + Version: $Revision: 1.19 $ + 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. - + =========================================================================*/ /** * \file * \brief class Executer: level 0 of script execution (code) */ -#include "bbtkExecuter.h" +#include "bbtkExecuter.h" #include "bbtkMessageManager.h" #include "bbtkFactory.h" #include "bbtkUtilities.h" - #include #ifdef _USE_WXWIDGETS_ @@ -36,197 +35,270 @@ #include "bbtkConfigurationFile.h" namespace bbtk -{ -/** - * - */ - Executer::Executer() - : mPackage(0), - mRoot(0), - mNoExecMode(false), - mDialogMode(NoDialog) +{ + //======================================================================= + Executer::Pointer Executer::New() { - //VirtualExec(); - - bbtkDebugMessageInc("Core",9,"Executer::Executer()" < create it to pass it to the factory + // We have to "lock" the smart pointer because the factory + // only keeps a weak pointer on the executer + // -> this would auto-destroy !! + mFactory->SetExecuter(MakePointer(this,true)); Reset(); - bbtkDebugDecTab("Core",9); - } - -/** - * - */ + bbtkDebugDecTab("Kernel",9); + } + //======================================================================= + + //======================================================================= Executer::~Executer() { - bbtkDebugMessageInc("Core",9,"Executer::~Executer()" <UnRegisterBlackBox("workspace"); - delete mRoot; - } - if (mPackage) - { - GetGlobalFactory()->UnLoadPackage("user"); - } - bbtkDebugDecTab("Core",9); + bbtkDebugMessageInc("Kernel",9,"==> Executer::~Executer()" <Reset(); + mFactory.reset(); + bbtkDebugDecTab("Kernel",9); } - + //======================================================================= + + //======================================================================= + /// Loads a package + void Executer::LoadPackage(const std::string &name ) + { + GetFactory()->LoadPackage(name); + } + //======================================================================= + + //======================================================================= + /// Unloads a package + void Executer::UnLoadPackage(const std::string &name ) + { + GetFactory()->UnLoadPackage(name); + } + //======================================================================= -/** - * - */ + //======================================================================= void Executer::Reset() { - bbtkDebugMessageInc("Core",9,"Executer::Reset()" <UnRegisterBlackBox(mRoot->GetTypeName()); - delete mRoot; - } - if (mPackage) - { - GetGlobalFactory()->UnLoadPackage("user"); - } - GetGlobalFactory()->Reset(); + bbtkDebugMessageInc("Kernel",9,"Executer::Reset()" <CheckPackages(); + + mOpenDefinition.clear(); + mOpenPackage.clear(); + GetFactory()->Reset(); + // Create user package - mPackage = new Package("user","internal to bbi", - "User defined black boxes", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + Package::Pointer p = + Package::New("user","internal to bbi", + "User defined black boxes", + "", + BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + // Insert the user package in the factory + GetFactory()->InsertPackage(p); + // And in the list of open packages + mOpenPackage.push_back(p); + mRootPackage = p; + // Create user workspace - mRoot = new ComplexBlackBoxDescriptor("workspace"); //,f); - mRoot->AddToAuthor("bbi (internal)"); - mRoot->AddToDescription("User's workspace"); - mOpenDefinition.push_back(CBBDefinition(mRoot,"user")); + ComplexBlackBoxDescriptor::Pointer r = + ComplexBlackBoxDescriptor::New("workspace"); + // mRootCBB->Reference(); + r->SetFactory(GetFactory()); + r->AddToAuthor("bbi (internal)"); + r->AddToDescription("User's workspace"); + mOpenDefinition.push_back(CBBDefinition(r,"user")); // Register it into the user package - mPackage->RegisterBlackBox(mRoot); - // Insert the user package in the factory - InsertPackage(mPackage); - mOpenPackage.push_back(mPackage); - bbtkDebugDecTab("Core",9); + p->RegisterBlackBox(r); + mRootCBB = r; + + // Object::PrintObjectListInfo(); + // GetFactory()->CheckPackages(); + + bbtkDebugDecTab("Kernel",9); } - + //======================================================================= + + //======================================================================= /// changes the workspace name void Executer::SetWorkspaceName( const std::string& n ) { - mPackage->ChangeBlackBoxName( mRoot->GetTypeName(), n ); + GetUserPackage()->ChangeBlackBoxName( GetWorkspace()->GetTypeName(), n ); } - + //======================================================================= + + //======================================================================= void Executer::BeginPackage (const std::string &name) { - bbtkDebugMessageInc("Core",9,"Executer::BeginPackage(\""<GetPackage(name); + p = GetFactory()->GetPackage(name); } catch (Exception e) { - p = new Package(name, - "", - "", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); - InsertPackage(p); + p = Package::New(name, + "", + "", + "", + BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + GetFactory()->InsertPackage(p); } - mOpenPackage.push_back(p); + mOpenPackage.push_back(p); } + //======================================================================= + //======================================================================= void Executer::EndPackage() { if (mOpenPackage.size()>1) mOpenPackage.pop_back(); } + //======================================================================= + //======================================================================= void Executer::Define (const std::string &name, - const std::string &pack, - const std::string &scriptfilename) + const std::string &pack, + const std::string &scriptfilename) { - bbtkDebugMessageInc("Core",9,"Executer::Define(\""<SetFactory(GetFactory()); b->SetScriptFileName(scriptfilename); mOpenDefinition.push_back( CBBDefinition( b, pack ) ); - bbtkDebugDecTab("Core",9); + bbtkDebugDecTab("Kernel",9); } + //======================================================================= + //======================================================================= + /// Sets the file name to use for the current definition + /// (Used to set it after the Define command) + void Executer::SetCurrentFileName (const std::string &name ) + { + mOpenDefinition.back().box->SetScriptFileName(name); + } + //======================================================================= + + //======================================================================= void Executer::EndDefine () { - bbtkDebugMessageInc("Core",9,"Executer::EndDefine(\"" + bbtkDebugMessageInc("Kernel",9,"Executer::EndDefine(\"" <GetTypeName()<<"\")" <0) { - try - { - p = GetGlobalFactory()->GetPackage(pname); - } - catch (Exception e) - { - p = new Package(pname, - "", - "", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); - InsertPackage(p); - } + try + { + p = GetFactory()->GetPackage(pname); + } + catch (Exception e) + { + p = Package::New(pname, + "", + "", + "", + BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + GetFactory()->InsertPackage(p); + } } - else + else { - p = mOpenPackage.back(); + p = mOpenPackage.back().lock(); } p->RegisterBlackBox(Current()); mOpenDefinition.pop_back(); } + //======================================================================= + //======================================================================= + void Executer::Kind(const std::string& kind) + { + if (kind=="ADAPTOR") + { + Current()->AddToCategory("adaptor"); + Current()->SetKind(bbtk::BlackBoxDescriptor::ADAPTOR); + } + else if (kind=="DEFAULT_ADAPTOR") + { + Current()->AddToCategory("adaptor"); + Current()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR); + } + if (kind=="GUI") + { + Current()->AddToCategory("gui"); + Current()->SetKind(bbtk::BlackBoxDescriptor::GUI); + } + else if (kind=="DEFAULT_GUI") + { + Current()->AddToCategory("gui"); + Current()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_GUI); + } + else + { + bbtkError("Unknown box kind : '"<Add(nodeType,nodeName); } - + //======================================================================= - /* - void Executer::Remove (const std::string &nodeName) - { - // Current()->RemoveBlackBox(nodeName); + //======================================================================= + void Executer::Destroy(const std::string &boxName) + { + Current()->Remove(boxName,true); } - */ + //======================================================================= -/** - * - */ - void Executer::Connect (const std::string &nodeFrom, - const std::string &outputLabel, + //======================================================================= + void Executer::Connect (const std::string &nodeFrom, + const std::string &outputLabel, const std::string &nodeTo, const std::string &inputLabel) { - Current()->Connect(nodeFrom, outputLabel, nodeTo, inputLabel); + Current()->Connect(nodeFrom, outputLabel, nodeTo, inputLabel); } - - /** - * - */ - void Executer::Update (const std::string &nodeName) // would 'Execute' be more meaningfull ? + //======================================================================= + + //======================================================================= + void Executer::Execute (const std::string &nodeName) { - // if in root - if (Current()==mRoot) + // if in root + if (Current()==GetWorkspace()) { if (!mNoExecMode) { @@ -238,17 +310,16 @@ namespace bbtk Current()->AddToExecutionList(nodeName) ; } } - -/** - * - */ + //======================================================================= + + //======================================================================= void Executer::DefineInput ( const std::string &name, const std::string &box, const std::string &input, const std::string& help) { // If the input is defined in the Root box - if (Current()==mRoot) + if (Current()==GetWorkspace()) { // If the dialog mode is set to NoDialog // and the user passed the name in the Inputs map @@ -272,7 +343,7 @@ namespace bbtk std::cin >> ans; Set(box,input,ans); } - #ifdef _USE_WXWIDGETS_ +#ifdef _USE_WXWIDGETS_ // If the dialog mode is set to GraphicalDialog // A dialog box is pop up else if (mDialogMode == GraphicalDialog) @@ -284,20 +355,18 @@ namespace bbtk mess += ")"; std::string title(name); title += " ?"; - std::string ans = wx2std ( wxGetTextFromUser( std2wx (mess), std2wx(title))); Set(box,input,ans); } #endif } - + Current()->DefineInput(name,box,input,help); - + } - - /** - * - */ + //======================================================================= + + //======================================================================= void Executer::DefineOutput ( const std::string &name, const std::string &box, const std::string &output, @@ -305,34 +374,33 @@ namespace bbtk { Current()->DefineOutput(name,box,output,help); } - - /** - * - */ + //======================================================================= + + //======================================================================= void Executer::Set (const std::string &box, const std::string &input, const std::string &value) { - BlackBox* b = Current()->GetPrototype()->bbGetBlackBox(box); + BlackBox::Pointer b = Current()->GetPrototype()->bbGetBlackBox(box); // Looks for the adaptor if ( b->bbGetInputType(input) != typeid(std::string) ) { - BlackBox* a = /*mFactory->*/ - NewAdaptor(typeid(std::string), - b->bbGetInputType(input), - "tmp"); + BlackBox::Pointer a = + GetFactory()->NewAdaptor(typeid(std::string), + b->bbGetInputType(input), + "tmp"); if (!a) - { - bbtkError("No <"<< - TypeName(b->bbGetInputType(input)) - <<"> to found"); - } + { + bbtkError("No <"<< + TypeName(b->bbGetInputType(input)) + <<"> to found"); + } std::string v(value); a->bbSetInput("In",v); a->bbExecute(); b->bbSetInput(input,a->bbGetOutput("Out")); - a->bbDelete(); + // a->Delete(); } else { @@ -340,77 +408,85 @@ namespace bbtk b->bbSetInput(input,v); } } + //======================================================================= - - /** - * - */ + //======================================================================= std::string Executer::Get(const std::string &box, const std::string &output) { - BlackBox* b = Current()->GetPrototype()->bbGetBlackBox(box); + BlackBox::Pointer b = Current()->GetPrototype()->bbGetBlackBox(box); // Looks for the adaptor if (b->bbGetOutputType(output) != typeid(std::string)) { - BlackBox* a = /*mFactory->*/ - NewAdaptor( - b->bbGetOutputType(output), - typeid(std::string), - "tmp"); - if (!a) - { - bbtkError("No <"<< - TypeName(b->bbGetOutputType(output)) - <<"> to found"); - } + BlackBox::Pointer a = + GetFactory()->NewAdaptor( + b->bbGetOutputType(output), + typeid(std::string), + "tmp"); + if (!a) + { + bbtkError("No <"<< + TypeName(b->bbGetOutputType(output)) + <<"> to found"); + } b->bbExecute(); - + a->bbSetInput("In",b->bbGetOutput(output)); a->bbExecute(); std::string r = a->bbGetOutput("Out").unsafe_get(); - //std::string v = *((std::string*)a->bbGetOutput("Out")) ; - // std::cout << a->bbGetOutput("Out").unsafe_get() - // << std::endl; - //std::string v(value); - //b->bbSetInput(input,a->bbGetOutput("Out")); - a->bbDelete(); + //std::string v = *((std::string*)a->bbGetOutput("Out")) ; + // std::cout << a->bbGetOutput("Out").unsafe_get() + // << std::endl; + //std::string v(value); + //b->bbSetInput(input,a->bbGetOutput("Out")); + // a->bbDelete(); return r; } - else + else { - b->bbExecute(); - return b->bbGetOutput(output).unsafe_get(); - // std::string v = *((std::string*)b->bbGetOutput(output)) ; - // std::cout << b->bbGetOutput("Out").unsafe_get() - // << std::endl; - // b->bbSetInput(input,&v); + b->bbExecute(); + return b->bbGetOutput(output).unsafe_get(); + // std::string v = *((std::string*)b->bbGetOutput(output)) ; + // std::cout << b->bbGetOutput("Out").unsafe_get() + // << std::endl; + // b->bbSetInput(input,&v); } } + //======================================================================= - + //======================================================================= void Executer::Author(const std::string &authorName) { - Current()->AddToAuthor(authorName,Current()==mRoot); + Current()->AddToAuthor(authorName,Current()==GetWorkspace()); } + //======================================================================= + //======================================================================= + void Executer::Category(const std::string &category) + { + Current()->AddToCategory(category,Current()==GetWorkspace()); + } + //======================================================================= - + //======================================================================= void Executer::Description(const std::string &d) { - Current()->AddToDescription(d,Current()==mRoot); + Current()->AddToDescription(d,Current()==GetWorkspace()); } + //======================================================================= - + //======================================================================= /// prints the list of the boxes of the current descriptor void Executer::PrintBoxes() - { + { bbtkMessageInc("Help",1,"The black box descriptor \"" <GetTypeName()<<"\" contains : "<PrintBlackBoxes(); bbtkDecTab("Help",1); } + //======================================================================= - + //======================================================================= std::string Executer::ShowGraph(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr, @@ -419,7 +495,6 @@ namespace bbtk const std::string &custom_title, bool system_display ) { - int detail = atoi(detailStr.c_str()); int level = atoi(levelStr.c_str()); @@ -431,80 +506,90 @@ namespace bbtk // No output provided : automatic generation if (output_html.length() == 0) { - // Don't pollute the file store with "doc_tmp" directories ... - std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_doc_tmp(); + // Don't pollute the file store with "temp_dir" directories ... + std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir(); char c = default_doc_dir.c_str()[strlen(default_doc_dir.c_str())-1]; std::string directory = default_doc_dir; if (c != '/' && c !='\\') directory = directory + "/"; - directory = directory + "doc_tmp"; + directory = directory + "temp_dir"; filename_rootHtml = directory + "/" + "User.html"; simplefilename_rootHtml = "User.html" ; // Creating directory std::string command0("mkdir \"" +directory + "\""); - system( command0.c_str() ); + system( command0.c_str() ); relative_link = false; } + Package::Pointer p; + try + { + p = GetFactory()->GetPackage(nameblackbox); + } + catch (Exception e) + { + p = GetUserPackage(); + } // Generating documentation-help of workspace - mPackage->SetDocURL(filename_rootHtml); - mPackage->SetDocRelativeURL(simplefilename_rootHtml); + p->SetDocURL(filename_rootHtml); + p->SetDocRelativeURL(simplefilename_rootHtml); + + p->CreateHtmlPage(filename_rootHtml,"bbi","user package",custom_header,custom_title,detail,level,relative_link); - mPackage->CreateHtmlPage(filename_rootHtml,"bbi","user package",custom_header,custom_title,detail,level,relative_link); - std::string page = filename_rootHtml; /* try - { - ShowGraphTypes(nameblackbox); - } - catch (bbtk::Exception a) - { - std::cout <<"EXC"<GetPrototype(); - } - else - { - blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox); - } + { + blackbox = Current()->GetPrototype(); + } + else + { + blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox); + } std::string page; if (blackbox) { - // Don't pollute the file store with "doc_tmp" directories ... - std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_doc_tmp(); + // Don't pollute the file store with "temp_dir" directories ... + std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir(); char c = default_doc_dir.c_str()[strlen(default_doc_dir.c_str())-1]; - + std::string directory = default_doc_dir; if (c != '/' && c !='\\') directory = directory + "/"; - directory = directory + "doc_tmp"; - - //std::string directory("doc_tmp"); + directory = directory + "temp_dir"; + //std::string directory("temp_dir"); std::string filename(directory + "/" + "bbtk_graph_pipeline"); std::string filename_html(filename+".html"); std::string command0("mkdir \""+directory + "\""); -#if defined(_WIN32) +#if defined(_WIN32) std::string command2("start "); #else std::string command2("gnome-open "); @@ -527,7 +612,7 @@ namespace bbtk } blackbox->bbInsertHTMLGraph( s, detail, level, true, directory, false ); - s << "\n"; + s << "\n"; } s.close(); @@ -538,48 +623,168 @@ namespace bbtk { bbtkMessageInc("Help",1,"No black box: \"" <GetPrototype(); + } + else + { + blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox); + } + + if (blackbox) + { + found=true; + blackbox->bbShowRelations(blackbox,detail,level); //,mFactory); + } + + if (!found) + { + bbtkError("Blackbox Name not found.. <" <"); + } + } + //======================================================================= -void Executer::ShowRelations(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr) + //======================================================================= + /// sets the level of message + void Executer::SetMessageLevel(const std::string &kind, + int level) { - bool found=false; + bbtk::MessageManager::SetMessageLevel(kind,level); + } + //======================================================================= - int detail = atoi(detailStr.c_str()); - int level = atoi(levelStr.c_str()); - BlackBox* blackbox=NULL; - if (nameblackbox.compare(".")==0) - { - blackbox=Current()->GetPrototype(); - } else { - blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox); - } + //======================================================================= + /// Prints help on the messages + void Executer::HelpMessages() + { + bbtk::MessageManager::PrintInfo(); + } + //======================================================================= + + //======================================================================= + /// + void Executer::Print(const std::string &str) + { + if (GetNoExecMode() && (Current()==GetWorkspace()) ) return; + if (Current()!=GetWorkspace()) return; + + bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""< trouver un nom unique : # commande + // InterpretLine("new Print _P_") + // InterpretLine("connect _C_.Out _P_.In") + // int num = 1 + + + std::vector chains; + std::string delimiters("$"); + + // Skip delimiters at beginning. + std::string::size_type lastPos = str.find_first_not_of(delimiters, 0); + bool is_text = true; + if (lastPos>0) is_text = false; + + // Find first delimiter. + std::string::size_type pos = str.find_first_of(delimiters, lastPos); + + while (std::string::npos != pos || std::string::npos != lastPos) + { + if (is_text) { - found=true; - blackbox->bbShowRelations(blackbox,detail,level); //,mFactory); + // Found a text token, add it to the vector. + chains.push_back(str.substr(lastPos, pos - lastPos)); + // std::string token = str.substr(lastPos, pos - lastPos) + // InterpretLine("set _C_.In%num% %token%") + } - - if (!found) + else { - bbtkError("Blackbox Name not found.. <" <"); + + // is an output (between $$) : decode + std::string tok,box,output; + tok = str.substr(lastPos, pos - lastPos); + Utilities::SplitAroundFirstDot(tok,box,output); + chains.push_back( Get(box,output) ); + +// InterpretLine("connect %tok% _C_.In%num%") + } + // Skip delimiters. Note the "not_of" + lastPos = str.find_first_not_of(delimiters, pos); + // Find next delimiter + pos = str.find_first_of(delimiters, lastPos); + // + is_text = !is_text; +// num ++; + } +// InterpretLine("exec _P_") +// if (IS_IN_WORKSPACE) InterpretLine("delete _C_; delete _P_"); + + std::vector::iterator i; + for (i= chains.begin(); i!=chains.end(); ++i) + { + // bbtkMessage("Echo",1,*i); + Utilities::SubsBackslashN(*i); + bbtkMessage("Output",1,*i); + } + bbtkMessage("Output",1,std::endl); } + //========================================================================== - /* - /// sets the level of message - void Executer::Message(const std::string &category, - const std::string& level) + //========================================================================== + std::string Executer::GetObjectName() const { - int l; - sscanf(level.c_str(),"%d",&l); - bbtk::MessageManager::SetMessageLevel(category,l); + return std::string("Executer"); } - */ - - + //========================================================================== + + //========================================================================== + std::string Executer::GetObjectInfo() const + { + std::stringstream i; + return i.str(); + } + //========================================================================== + //========================================================================== +size_t Executer::GetObjectSize() const +{ + size_t s = Superclass::GetObjectSize(); + s += Executer::GetObjectInternalSize(); + return s; + } + //========================================================================== + //========================================================================== +size_t Executer::GetObjectInternalSize() const +{ + size_t s = sizeof(Executer); + return s; + } + //========================================================================== + //========================================================================== + size_t Executer::GetObjectRecursiveSize() const + { + size_t s = Superclass::GetObjectRecursiveSize(); + s += Executer::GetObjectInternalSize(); + s += mFactory->GetObjectRecursiveSize(); + return s; + } + //========================================================================== }//namespace