X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=84273c0815cc85404d6c1fe180218b37f3a15241;hb=2c72a4807a6dd861fc034cd8cc6f3580679ef926;hp=9fa297fef97255169453154daae0800cf02c359c;hpb=41dd99d33d99d0e17448d401a1d46ef390b5d525;p=bbtk.git diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx index 9fa297f..84273c0 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/22 09:40:10 $ - Version: $Revision: 1.20 $ - - 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: 2009/01/27 14:22:56 $ + Version: $Revision: 1.27 $ +=========================================================================*/ - 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 @@ -51,7 +64,8 @@ namespace bbtk mRootPackage(), mRootCBB(), mNoExecMode(false), - mDialogMode(NoDialog) + mDialogMode(NoDialog), + mNoErrorMode(false) { bbtkDebugMessageInc("Kernel",9,"Executer::Executer()" <InsertPackage(p); // And in the list of open packages @@ -122,7 +133,7 @@ namespace bbtk ComplexBlackBoxDescriptor::New("workspace"); // mRootCBB->Reference(); r->SetFactory(GetFactory()); - r->AddToAuthor("bbi (internal)"); + r->AddToAuthor("bbtk"); r->AddToDescription("User's workspace"); mOpenDefinition.push_back(CBBDefinition(r,"user")); // Register it into the user package @@ -136,6 +147,7 @@ namespace bbtk } //======================================================================= + //======================================================================= /// changes the workspace name void Executer::SetWorkspaceName( const std::string& n ) @@ -156,11 +168,7 @@ namespace bbtk } catch (Exception e) { - p = Package::New(name, - "", - "", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + p = Package::New(name,"","",""); GetFactory()->InsertPackage(p); } mOpenPackage.push_back(p); @@ -202,6 +210,15 @@ namespace bbtk } //======================================================================= + //======================================================================= + void Executer::Clear() + { + bbtkDebugMessageInc("Kernel",9,"Executer::Clear()" <GetPrototype()->Clear(); + + } + //======================================================================= + //======================================================================= void Executer::EndDefine () { @@ -219,11 +236,7 @@ namespace bbtk } catch (Exception e) { - p = Package::New(pname, - "", - "", - "", - BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)); + p = Package::New(pname,"","",""); GetFactory()->InsertPackage(p); } } @@ -343,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) @@ -506,23 +519,23 @@ 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::Pointer p; @@ -538,7 +551,7 @@ namespace bbtk 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; /*