X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.h;h=ee5c86c587bd98c1ca5ecf276c16370892bf14a9;hb=a09174b82cb36ffd30bdbaed12c6ebd936a0e8f7;hp=02985af8c9253b519377785aad224fbf04fc5ef4;hpb=4a17a289103f77885e288aaae250e57c91ae3424;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index 02985af..ee5c86c 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.h,v $ $ Language: C++ - Date: $Date: 2008/03/26 08:27:19 $ - Version: $Revision: 1.22 $ + Date: $Date: 2008/07/23 11:46:11 $ + Version: $Revision: 1.32 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -29,7 +29,6 @@ #include "bbtkVirtualExec.h" #include "bbtkExecuter.h" -#include "bbtkTranscriptor.h" #include #include @@ -41,19 +40,23 @@ namespace bbtk class WxConsole; #endif + //======================================================================= class BBTK_EXPORT InterpreterUser { public: InterpreterUser() {} - ~InterpreterUser() {} + virtual ~InterpreterUser() {} virtual bool InterpreterUserHasOwnHtmlPageViewer() { return false; } virtual void InterpreterUserViewHtmlPage(const std::string&) {} }; + //======================================================================= - /// + + + //======================================================================= class BBTK_EXPORT InterpreterError : public Exception { public: @@ -77,65 +80,17 @@ namespace bbtk std::string mScriptFile; int mScriptLine; }; + //======================================================================= - /// - class BBTK_EXPORT Interpreter + //======================================================================= + class BBTK_EXPORT Interpreter : public Object { - - private: - - /// The enumeration of command codes == Command name - typedef enum - { - cNew, - cDelete, - cConnect, - cExec, - cPackage, - cEndPackage, - cDefine, - cEndDefine, - cInput, - cOutput, - cSet, - cConfig, // JPR - cReset, // EED - cAuthor, - cCategory, // JPR - cDescription, - cHelp, - cMessage, - cInclude, - cQuit, - cLoad, - cUnload, - cGraph, - cPrint, - cIndex, - cWorkspace // LG - } CommandCodeType; - - /// The structure storing the informations on a command - typedef struct - { - std::string category; - int argmin, argmax; - CommandCodeType code; - std::string syntax; - std::string help; - } CommandInfoType; - - /// The type of dictionnary of commands - typedef std::map CommandDictType; - + BBTK_OBJECT_INTERFACE_NO_CONDES(Interpreter); + typedef Object Superclass; public: - /// Constructor - Interpreter(); - - /// Destructor - ~Interpreter(); - + static Pointer New(const std::string& cpp_file = ""); + static Pointer New(VirtualExec::Pointer); typedef enum { @@ -163,25 +118,24 @@ namespace bbtk /// Sets the inputs of the workspace : /// the map is passed as is to the Executer void SetInputs(const std::map& m) - { mExecuter->SetInputs(m); } + { mVirtualExecuter->SetInputs(m); } /// Puts the executer in "no exec" mode, /// which creates but does not execute pipelines. - void SetNoExecMode(bool b) { mExecuter->SetNoExecMode(b); } + void SetNoExecMode(bool b) { mVirtualExecuter->SetNoExecMode(b); } /// //typedef Executer::DialogModeType DialogModeType; typedef VirtualExec::DialogModeType DialogModeType; - void SetDialogMode(DialogModeType t) { mExecuter->SetDialogMode(t); } + void SetDialogMode(DialogModeType t) + { mVirtualExecuter->SetDialogMode(t); } /// Sets the bool that indicates wether we are in command line context void SetCommandLine(bool v = true) { mCommandLine = v; } void SetThrow(bool b) { mThrow = b; } - - #ifdef _USE_WXWIDGETS_ /// Sets the user of the interpreter (if any) void SetUser(InterpreterUser* c) { mUser = c; } @@ -193,12 +147,59 @@ namespace bbtk #endif /// Gets the Executer - VirtualExec* GetExecuter() { return mExecuter; } - /// Gets the Executer (const) - const VirtualExec* GetExecuter() const { return mExecuter; } + VirtualExec::Pointer GetExecuter() const { return mVirtualExecuter; } protected: + + /// The enumeration of command codes == Command name + typedef enum + { + cNew, + cDelete, + cConnect, + cExec, + cPackage, + cEndPackage, + cDefine, + cEndDefine, + cInput, + cOutput, + cSet, + cConfig, // JPR + cReset, // EED + cAuthor, + cCategory, // JPR + cDescription, + cHelp, + cMessage, + cInclude, + cQuit, + cLoad, + cUnload, + cGraph, + cPrint, + cIndex, + cKind, // LG + cNewGUI, // LG + cWorkspace, // LG + cDebug // LG + } CommandCodeType; + + /// The structure storing the informations on a command + typedef struct + { + std::string keyword; + int argmin, argmax; + CommandCodeType code; + std::string syntax; + std::string help; + } CommandInfoType; + + /// The type of dictionnary of commands + typedef std::map CommandDictType; + + /// Interprets a line void InterpretLine( const std::string& line, bool &insideComment ); @@ -225,6 +226,9 @@ namespace bbtk /// Closes all open files void CloseAllFiles(); + /// Resets all + void Reset(); + /// Displays help (entry point of any help) void Help(const std::vector& words); @@ -249,10 +253,25 @@ namespace bbtk int n, std::vector& commands ); + /// Creates and connects the piece of pipeline which defines a GUI + /// for the box box. + /// Define it as a complex box type with name instanceName+"Type" + /// The instance is called instanceName + /// and connected to the existing pipeline + void NewGUI(const std::string& box, + const std::string& instanceName); + void Debug(const std::string& arg); private: + /// Constructor + Interpreter(const std::string& cpp_file = ""); + + Interpreter(VirtualExec::Pointer); + + void Init(VirtualExec::Pointer, const std::string& cpp_file); + /// Opens the file fullPathScriptName /// includeScriptName is the name as given to the include command void LoadScript( std::string fullPathScriptName, @@ -263,13 +282,14 @@ namespace bbtk void CatchStdException( const std::exception& e ); void CatchUnknownException(); - private: + //================================================================== // ATTRIBUTES /// The command executer used - bbtk::VirtualExec* mExecuter; + bbtk::VirtualExec::Pointer mVirtualExecuter; + bbtk::Executer::WeakPointer mRealExecuter; /// The user of the interpreter (0 if none) bbtk::InterpreterUser* mUser; @@ -280,6 +300,11 @@ namespace bbtk /// Vector of names of open files with full path (as open) std::vector mFileName; + /// Vector of names of files which have been open + /// before (and may closed then which are no more in mFileName) + /// with full path (as open) + std::vector mFileNameHistory; + /// Vector of names of open files as given to the include command std::vector mIncludeFileName; @@ -299,6 +324,9 @@ namespace bbtk bool mThrow; + protected: + ~Interpreter(); + }; // EO class Interpreter