X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=af9c62ffb07b5eb8e8dc7c653a0e6a131e94b4e0;hb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;hp=7564baf85337198a81111d65f2c6478aef454ea2;hpb=76f2826fd6b67d3a15fe72c1b50d5ee1af1960a1;p=bbtk.git diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx index 7564baf..af9c62f 100644 --- a/kernel/src/bbtkExecuter.cxx +++ b/kernel/src/bbtkExecuter.cxx @@ -1,20 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk - Module: $RCSfile: bbtkExecuter.cxx,v $ $ + Module: $RCSfile: bbtkExecuter.cxx,v $ Language: C++ - Date: $Date: 2008/02/14 11:38:58 $ - 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 - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - + Date: $Date: 2008/12/11 15:30:04 $ + Version: $Revision: 1.24 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) +* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux +* +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* or in the file LICENSE.txt. +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited +* liability. +* +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL-B license and that you accept its terms. +* ------------------------------------------------------------------------ */ + /** * \file * \brief class Executer: level 0 of script execution (code) @@ -26,7 +39,7 @@ #include "bbtkUtilities.h" #include -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS #include #endif @@ -35,224 +48,291 @@ #include "bbtkConfigurationFile.h" namespace bbtk -{ -/** - * - */ +{ + //======================================================================= + Executer::Pointer Executer::New() + { + bbtkDebugMessage("Kernel",9,"Executer::New()"< 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("Kernel",9); - } + } + //======================================================================= -/** - * - */ + //======================================================================= Executer::~Executer() { - bbtkDebugMessageInc("Kernel",9,"Executer::~Executer()" <UnRegisterBlackBox("workspace"); - delete mRoot; - } - if (mPackage) - { - GetGlobalFactory()->UnLoadPackage("user"); - } + 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("Kernel",9,"Executer::Reset()" <UnRegisterBlackBox(mRoot->GetTypeName()); - delete mRoot; - } - if (mPackage) - { - GetGlobalFactory()->UnLoadPackage("user"); - } - GetGlobalFactory()->Reset(); + GetFactory()->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", + "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("bbtk"); + 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); + 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("Kernel",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); } + //======================================================================= + //======================================================================= 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("Kernel",9,"Executer::Define(\""<SetFactory(GetFactory()); b->SetScriptFileName(scriptfilename); mOpenDefinition.push_back( CBBDefinition( b, pack ) ); 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("Kernel",9,"Executer::EndDefine(\"" - <GetTypeName()<<"\")" + <GetTypeName()<<"\")" <0) - { - try { - p = GetGlobalFactory()->GetPackage(pname); + try + { + p = GetFactory()->GetPackage(pname); + } + catch (Exception e) + { + p = Package::New(pname, + "", + "", + "", + BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + GetFactory()->InsertPackage(p); + } } - catch (Exception e) + else { - p = new Package(pname, - "", - "", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); - InsertPackage(p); + p = mOpenPackage.back().lock(); } - } - else - { - p = mOpenPackage.back(); - } - p->RegisterBlackBox(Current()); - + p->RegisterBlackBox(GetCurrentDescriptor()); + mOpenDefinition.pop_back(); } + //======================================================================= + //======================================================================= + void Executer::Kind(const std::string& kind) + { + if (kind=="ADAPTOR") + { + GetCurrentDescriptor()->AddToCategory("adaptor"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::ADAPTOR); + } + else if (kind=="DEFAULT_ADAPTOR") + { + GetCurrentDescriptor()->AddToCategory("adaptor"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR); + } + if (kind=="GUI") + { + GetCurrentDescriptor()->AddToCategory("gui"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::GUI); + } + else if (kind=="DEFAULT_GUI") + { + GetCurrentDescriptor()->AddToCategory("gui"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_GUI); + } + else + { + bbtkError("Unknown box kind : '"<Add(nodeType,nodeName); + GetCurrentDescriptor()->Add(nodeType,nodeName); } + //======================================================================= - /* - void Executer::Remove (const std::string &nodeName) + //======================================================================= + void Executer::Destroy(const std::string &boxName) { - // Current()->RemoveBlackBox(nodeName); + GetCurrentDescriptor()->Remove(boxName,true); } - */ + //======================================================================= -/** - * - */ - void Executer::Connect (const std::string &nodeFrom, + //======================================================================= + 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); + GetCurrentDescriptor()->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 (GetCurrentDescriptor()==GetWorkspace()) { if (!mNoExecMode) { - Current()->GetPrototype()->bbGetBlackBox(nodeName)->bbExecute(true); + GetCurrentDescriptor()->GetPrototype()->bbGetBlackBox(nodeName)->bbExecute(true); } } else { - Current()->AddToExecutionList(nodeName) ; + GetCurrentDescriptor()->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 (GetCurrentDescriptor()==GetWorkspace()) { // If the dialog mode is set to NoDialog // and the user passed the name in the Inputs map @@ -276,7 +356,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) @@ -294,48 +374,46 @@ namespace bbtk #endif } - Current()->DefineInput(name,box,input,help); + GetCurrentDescriptor()->DefineInput(name,box,input,help); } + //======================================================================= - /** - * - */ + //======================================================================= void Executer::DefineOutput ( const std::string &name, const std::string &box, const std::string &output, const std::string& help) { - Current()->DefineOutput(name,box,output,help); + GetCurrentDescriptor()->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 = GetCurrentDescriptor()->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 { @@ -343,78 +421,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 = GetCurrentDescriptor()->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 { - 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); + GetCurrentDescriptor()->AddToAuthor(authorName,GetCurrentDescriptor()==GetWorkspace()); } + //======================================================================= + //======================================================================= void Executer::Category(const std::string &category) { - Current()->AddToCategory(category,Current()==mRoot); + GetCurrentDescriptor()->AddToCategory(category,GetCurrentDescriptor()==GetWorkspace()); } + //======================================================================= + //======================================================================= void Executer::Description(const std::string &d) { - Current()->AddToDescription(d,Current()==mRoot); + GetCurrentDescriptor()->AddToDescription(d,GetCurrentDescriptor()==GetWorkspace()); } + //======================================================================= - + //======================================================================= /// prints the list of the boxes of the current descriptor void Executer::PrintBoxes() - { + { bbtkMessageInc("Help",1,"The black box descriptor \"" - <GetTypeName()<<"\" contains : "<PrintBlackBoxes(); + <GetTypeName()<<"\" contains : "<PrintBlackBoxes(); bbtkDecTab("Help",1); } + //======================================================================= + //======================================================================= std::string Executer::ShowGraph(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr, @@ -434,69 +519,70 @@ namespace bbtk // No output provided : automatic generation if (output_html.length() == 0) { - // Don't pollute the file store with "temp_dir" directories ... - std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir(); + // 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]; + 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 + "temp_dir"; + std::string directory = default_doc_dir; + if (c != '/' && c !='\\') directory = directory + "/"; + directory = directory + "temp_dir"; - filename_rootHtml = directory + "/" + "User.html"; - simplefilename_rootHtml = "User.html" ; + filename_rootHtml = directory + "/" + "User.html"; + simplefilename_rootHtml = "User.html" ; - // Creating directory - std::string command0("mkdir \"" +directory + "\""); - system( command0.c_str() ); + // Creating directory + std::string command0("mkdir \"" +directory + "\""); + system( command0.c_str() ); - relative_link = false; + relative_link = false; } - - Package* p; + Package::Pointer p; try { - p = GetGlobalFactory()->GetPackage(nameblackbox); + p = GetFactory()->GetPackage(nameblackbox); } catch (Exception e) { - p = mPackage; + p = GetUserPackage(); } // Generating documentation-help of workspace p->SetDocURL(filename_rootHtml); p->SetDocRelativeURL(simplefilename_rootHtml); - p->CreateHtmlPage(filename_rootHtml,"bbi","user package",custom_header,custom_title,detail,level,relative_link); + p->CreateHtmlPage(filename_rootHtml,"bbtk","user package",custom_header,custom_title,detail,level,relative_link); std::string page = filename_rootHtml; /* try { - ShowGraphTypes(nameblackbox); + ShowGraphTypes(nameblackbox); } catch (bbtk::Exception a) { - std::cout <<"EXC"<GetPrototype(); + blackbox = GetCurrentDescriptor()->GetPrototype(); } else { - blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox); + blackbox = GetCurrentDescriptor()->GetPrototype()->bbFindBlackBox(nameblackbox); } std::string page; @@ -553,43 +639,164 @@ namespace bbtk } return page; } + //======================================================================= -void Executer::ShowRelations(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr) + //======================================================================= + void Executer::ShowRelations(const std::string &nameblackbox, + const std::string &detailStr, + const std::string &levelStr) { - bool found=false; + bool found=false; + + int detail = atoi(detailStr.c_str()); + int level = atoi(levelStr.c_str()); + BlackBox::Pointer blackbox; + if (nameblackbox.compare(".")==0) + { + blackbox=GetCurrentDescriptor()->GetPrototype(); + } + else + { + blackbox = GetCurrentDescriptor()->GetPrototype()->bbFindBlackBox(nameblackbox); + } + + if (blackbox) + { + found=true; + blackbox->bbShowRelations(blackbox,detail,level); //,mFactory); + } + + if (!found) + { + bbtkError("Blackbox Name not found.. <" <"); + } + } + //======================================================================= - 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); - } + //======================================================================= + /// sets the level of message + void Executer::SetMessageLevel(const std::string &kind, + int level) + { + bbtk::MessageManager::SetMessageLevel(kind,level); + } + //======================================================================= + + //======================================================================= + /// Prints help on the messages + void Executer::HelpMessages() + { + bbtk::MessageManager::PrintInfo(); + } + //======================================================================= + + //======================================================================= + /// + void Executer::Print(const std::string &str) + { + if (GetNoExecMode() && (GetCurrentDescriptor()==GetWorkspace()) ) return; + if (GetCurrentDescriptor()!=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) + { + Utilities::SubsBackslashN(*i); + bbtkMessage("Output",1,*i); + } + bbtkMessage("Output",1,std::endl); } + //========================================================================== - /* - /// sets the level of message - void Executer::Message(const std::string &kind, - const std::string& level) + //========================================================================== + std::string Executer::GetObjectName() const { - int l; - sscanf(level.c_str(),"%d",&l); - bbtk::MessageManager::SetMessageLevel(kind,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