X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkInterpreter.h;h=48bd0ae2c22cd492ce927a5faf544a458cbb2807;hb=c2a4b1893412e50a3d9abff221938a2d16c4a7cb;hp=93fad6de074a72a0df994e9f2281ba1415f0afba;hpb=61352f4baaeca7c15a3f77edfeff344cc6dc4e99;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h
index 93fad6d..48bd0ae 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/21 11:44:37 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2008/04/09 11:16:57 $
+  Version:   $Revision: 1.25 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,8 +28,6 @@
 #define __bbtkInterpreter_h__
 
 #include "bbtkVirtualExec.h"
-#include "bbtkExecuter.h"
-#include "bbtkTranscriptor.h"
 
 #include <fstream>
 #include <deque>
@@ -53,6 +51,33 @@ namespace bbtk
 
   };
 
+  ///
+  class BBTK_EXPORT InterpreterError : public Exception
+  {
+  public:
+    InterpreterError( const std::string& message,
+		      bool in_script_file,
+		      const std::string& script_file,
+		      int script_line 
+		      );
+    InterpreterError( const Exception& excep,
+		      bool in_script_file,
+		      const std::string& script_file,
+		      int script_line 
+		      );
+    ~InterpreterError() throw() {}
+
+    bool IsInScriptFile() const { return mInScriptFile; }
+    const std::string& GetScriptFile() const { return mScriptFile; }
+    int GetScriptLine() const { return mScriptLine; }
+  private:
+    bool mInScriptFile;
+    std::string mScriptFile;
+    int mScriptLine;
+  };
+
+
+  /// 
   class BBTK_EXPORT Interpreter
   {
 
@@ -86,13 +111,15 @@ namespace bbtk
       cGraph,
       cPrint,
       cIndex,
+      cKind, // LG
+      cNewGUI, // LG
       cWorkspace // LG
     } CommandCodeType;
 
     /// The structure storing the informations on a command 
     typedef struct 
     {
-      std::string category;
+      std::string keyword;
       int argmin, argmax;
       CommandCodeType code;
       std::string syntax;
@@ -104,7 +131,7 @@ namespace bbtk
 
   public:
     /// Constructor
-    Interpreter();
+    Interpreter(const std::string& cpp_file = "");
 
     /// Destructor
     ~Interpreter();
@@ -153,8 +180,6 @@ namespace bbtk
 
     void SetThrow(bool b) { mThrow = b; }
 
- 
-    
 #ifdef _USE_WXWIDGETS_
     /// Sets the user of the interpreter (if any)
     void SetUser(InterpreterUser* c) { mUser = c; }
@@ -213,7 +238,7 @@ namespace bbtk
     ///
     void Config() const; 
     /// 
-    void Print(const std::string&);
+    //    void Print(const std::string&);
 
     void Index(const std::string& filename, 
 	       const std::string& type = "Initials");
@@ -222,7 +247,13 @@ namespace bbtk
 				 int n,
 				 std::vector<std::string>& 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);
 
   private:
 
@@ -231,6 +262,11 @@ namespace bbtk
     void LoadScript( std::string fullPathScriptName,
 		     std::string includeScriptName);
 
+    /// 
+    void CatchBbtkException( const bbtk::Exception& e );
+    void CatchStdException( const std::exception& e );
+    void CatchUnknownException();
+
   private:
 
     //==================================================================
@@ -248,6 +284,11 @@ namespace bbtk
     /// Vector of names of open files with full path (as open)
     std::vector<std::string> 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<std::string> mFileNameHistory;
+
     /// Vector of names of open files as given to the include command
     std::vector<std::string> mIncludeFileName;