X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=af9c62ffb07b5eb8e8dc7c653a0e6a131e94b4e0;hb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;hp=3c7b04cf704b7f803921ee9dcfc8be9e693718b0;hpb=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx index 3c7b04c..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/04/08 06:59:30 $ - Version: $Revision: 1.16 $ - - 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. + Date: $Date: 2008/12/11 15:30:04 $ + Version: $Revision: 1.24 $ +=========================================================================*/ - 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. +/* --------------------------------------------------------------------- + +* 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 @@ -36,18 +49,31 @@ namespace bbtk { + //======================================================================= + Executer::Pointer Executer::New() + { + bbtkDebugMessage("Kernel",9,"Executer::New()"<SetExecuter(this); + mFactory = Factory::New(); + // The smart pointer on this is not made yet (is made by 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); } @@ -56,18 +82,11 @@ namespace bbtk //======================================================================= Executer::~Executer() { - bbtkDebugMessageInc("Kernel",9,"Executer::~Executer()" <UnRegisterBlackBox("workspace"); - delete mRootCBB; - } - if (mRootPackage) - { - GetFactory()->UnLoadPackage("user"); - } - delete mFactory; - + bbtkDebugMessageInc("Kernel",9,"==> Executer::~Executer()" <Reset(); + mFactory.reset(); bbtkDebugDecTab("Kernel",9); } //======================================================================= @@ -93,40 +112,38 @@ namespace bbtk { bbtkDebugMessageInc("Kernel",9,"Executer::Reset()" <UnRegisterBlackBox(mRootCBB->GetTypeName()); - delete mRootCBB; - } - if (mRootPackage) - { - GetFactory()->UnLoadPackage("user"); - } + GetFactory()->CheckPackages(); + + mOpenDefinition.clear(); + mOpenPackage.clear(); GetFactory()->Reset(); // Create user package - mRootPackage = new Package("user","internal to bbi", - "User defined black boxes", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); - // Create user workspace - mRootCBB = new ComplexBlackBoxDescriptor("workspace"); //,f); - mRootCBB->SetFactory(GetFactory()); - mRootCBB->AddToAuthor("bbi (internal)"); - mRootCBB->AddToDescription("User's workspace"); - mOpenDefinition.push_back(CBBDefinition(mRootCBB,"user")); - // Register it into the user package - mRootPackage->RegisterBlackBox(mRootCBB); + 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(mRootPackage); + GetFactory()->InsertPackage(p); // And in the list of open packages - mOpenPackage.push_back(mRootPackage); + mOpenPackage.push_back(p); + mRootPackage = p; + + // Create user workspace + 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 + p->RegisterBlackBox(r); + mRootCBB = r; + + // Object::PrintObjectListInfo(); + // GetFactory()->CheckPackages(); bbtkDebugDecTab("Kernel",9); } @@ -136,7 +153,7 @@ namespace bbtk /// changes the workspace name void Executer::SetWorkspaceName( const std::string& n ) { - mRootPackage->ChangeBlackBoxName( mRootCBB->GetTypeName(), n ); + GetUserPackage()->ChangeBlackBoxName( GetWorkspace()->GetTypeName(), n ); } //======================================================================= @@ -145,19 +162,19 @@ namespace bbtk { bbtkDebugMessageInc("Kernel",9,"Executer::BeginPackage(\""<GetPackage(name); } catch (Exception e) { - p = new Package(name, + p = Package::New(name, "", "", "", BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); - GetFactory()->InsertPackage(p); + GetFactory()->InsertPackage(p); } mOpenPackage.push_back(p); } @@ -179,7 +196,8 @@ namespace bbtk ","<SetFactory(GetFactory()); b->SetScriptFileName(scriptfilename); mOpenDefinition.push_back( CBBDefinition( b, pack ) ); @@ -201,10 +219,10 @@ namespace bbtk void Executer::EndDefine () { bbtkDebugMessageInc("Kernel",9,"Executer::EndDefine(\"" - <GetTypeName()<<"\")" + <GetTypeName()<<"\")" <0) { @@ -214,19 +232,19 @@ namespace bbtk } catch (Exception e) { - p = new Package(pname, - "", - "", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + p = Package::New(pname, + "", + "", + "", + BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); GetFactory()->InsertPackage(p); } } else { - p = mOpenPackage.back(); + p = mOpenPackage.back().lock(); } - p->RegisterBlackBox(Current()); + p->RegisterBlackBox(GetCurrentDescriptor()); mOpenDefinition.pop_back(); } @@ -237,29 +255,29 @@ namespace bbtk { if (kind=="ADAPTOR") { - Current()->AddToCategory("adaptor"); - Current()->SetKind(bbtk::BlackBoxDescriptor::ADAPTOR); + GetCurrentDescriptor()->AddToCategory("adaptor"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::ADAPTOR); } else if (kind=="DEFAULT_ADAPTOR") { - Current()->AddToCategory("adaptor"); - Current()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR); + GetCurrentDescriptor()->AddToCategory("adaptor"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR); } - if (kind=="WIDGET_ADAPTOR") + if (kind=="GUI") { - Current()->AddToCategory("adaptor"); - Current()->SetKind(bbtk::BlackBoxDescriptor::WIDGET_ADAPTOR); + GetCurrentDescriptor()->AddToCategory("gui"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::GUI); } - else if (kind=="DEFAULT_WIDGET_ADAPTOR") + else if (kind=="DEFAULT_GUI") { - Current()->AddToCategory("adaptor"); - Current()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR); + GetCurrentDescriptor()->AddToCategory("gui"); + GetCurrentDescriptor()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_GUI); } else { bbtkError("Unknown box kind : '"<Add(nodeType,nodeName); + GetCurrentDescriptor()->Add(nodeType,nodeName); } //======================================================================= //======================================================================= void Executer::Destroy(const std::string &boxName) { - bbtkError("Executer::Destroy : NOT IMPLEMENTED !"); + GetCurrentDescriptor()->Remove(boxName,true); } //======================================================================= @@ -285,7 +303,7 @@ namespace bbtk const std::string &nodeTo, const std::string &inputLabel) { - Current()->Connect(nodeFrom, outputLabel, nodeTo, inputLabel); + GetCurrentDescriptor()->Connect(nodeFrom, outputLabel, nodeTo, inputLabel); } //======================================================================= @@ -293,16 +311,16 @@ namespace bbtk void Executer::Execute (const std::string &nodeName) { // if in root - if (Current()==mRootCBB) + if (GetCurrentDescriptor()==GetWorkspace()) { if (!mNoExecMode) { - Current()->GetPrototype()->bbGetBlackBox(nodeName)->bbExecute(true); + GetCurrentDescriptor()->GetPrototype()->bbGetBlackBox(nodeName)->bbExecute(true); } } else { - Current()->AddToExecutionList(nodeName) ; + GetCurrentDescriptor()->AddToExecutionList(nodeName) ; } } //======================================================================= @@ -314,7 +332,7 @@ namespace bbtk const std::string& help) { // If the input is defined in the Root box - if (Current()==mRootCBB) + if (GetCurrentDescriptor()==GetWorkspace()) { // If the dialog mode is set to NoDialog // and the user passed the name in the Inputs map @@ -338,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) @@ -356,7 +374,7 @@ namespace bbtk #endif } - Current()->DefineInput(name,box,input,help); + GetCurrentDescriptor()->DefineInput(name,box,input,help); } //======================================================================= @@ -367,7 +385,7 @@ namespace bbtk const std::string &output, const std::string& help) { - Current()->DefineOutput(name,box,output,help); + GetCurrentDescriptor()->DefineOutput(name,box,output,help); } //======================================================================= @@ -376,12 +394,12 @@ namespace bbtk 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 = + BlackBox::Pointer a = GetFactory()->NewAdaptor(typeid(std::string), b->bbGetInputType(input), "tmp"); @@ -395,7 +413,7 @@ namespace bbtk a->bbSetInput("In",v); a->bbExecute(); b->bbSetInput(input,a->bbGetOutput("Out")); - a->bbDelete(); + // a->Delete(); } else { @@ -409,11 +427,11 @@ namespace bbtk 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 = + BlackBox::Pointer a = GetFactory()->NewAdaptor( b->bbGetOutputType(output), typeid(std::string), @@ -434,7 +452,7 @@ namespace bbtk // << std::endl; //std::string v(value); //b->bbSetInput(input,a->bbGetOutput("Out")); - a->bbDelete(); + // a->bbDelete(); return r; } else @@ -452,21 +470,21 @@ namespace bbtk //======================================================================= void Executer::Author(const std::string &authorName) { - Current()->AddToAuthor(authorName,Current()==mRootCBB); + GetCurrentDescriptor()->AddToAuthor(authorName,GetCurrentDescriptor()==GetWorkspace()); } //======================================================================= //======================================================================= void Executer::Category(const std::string &category) { - Current()->AddToCategory(category,Current()==mRootCBB); + GetCurrentDescriptor()->AddToCategory(category,GetCurrentDescriptor()==GetWorkspace()); } //======================================================================= //======================================================================= void Executer::Description(const std::string &d) { - Current()->AddToDescription(d,Current()==mRootCBB); + GetCurrentDescriptor()->AddToDescription(d,GetCurrentDescriptor()==GetWorkspace()); } //======================================================================= @@ -475,8 +493,8 @@ namespace bbtk void Executer::PrintBoxes() { bbtkMessageInc("Help",1,"The black box descriptor \"" - <GetTypeName()<<"\" contains : "<PrintBlackBoxes(); + <GetTypeName()<<"\" contains : "<PrintBlackBoxes(); bbtkDecTab("Help",1); } //======================================================================= @@ -501,39 +519,39 @@ 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 = GetFactory()->GetPackage(nameblackbox); } catch (Exception e) { - p = mRootPackage; + 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; /* @@ -557,14 +575,14 @@ namespace bbtk bool system_display) { - BlackBox* blackbox=NULL; + BlackBox::Pointer blackbox; if (nameblackbox==".") { - blackbox=Current()->GetPrototype(); + blackbox = GetCurrentDescriptor()->GetPrototype(); } else { - blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox); + blackbox = GetCurrentDescriptor()->GetPrototype()->bbFindBlackBox(nameblackbox); } std::string page; @@ -632,14 +650,14 @@ namespace bbtk int detail = atoi(detailStr.c_str()); int level = atoi(levelStr.c_str()); - BlackBox* blackbox=NULL; + BlackBox::Pointer blackbox; if (nameblackbox.compare(".")==0) { - blackbox=Current()->GetPrototype(); + blackbox=GetCurrentDescriptor()->GetPrototype(); } else { - blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox); + blackbox = GetCurrentDescriptor()->GetPrototype()->bbFindBlackBox(nameblackbox); } if (blackbox) @@ -676,8 +694,8 @@ namespace bbtk /// void Executer::Print(const std::string &str) { - if (GetNoExecMode() && (Current()==mRootCBB) ) return; - if (Current()!=mRootCBB) return; + if (GetNoExecMode() && (GetCurrentDescriptor()==GetWorkspace()) ) return; + if (GetCurrentDescriptor()!=GetWorkspace()) return; bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<::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); } + //========================================================================== + //========================================================================== + std::string Executer::GetObjectName() const + { + 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