X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkVirtualExec.h;h=1bb48a94fab0729263345db374c2202d34eee9a8;hb=28300312b87bd50ca689d497c5a500ad4d343d5d;hp=9a15909b31992747064a408f34abcd5fcfcd9635;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h
index 9a15909..1bb48a9 100644
--- a/kernel/src/bbtkVirtualExec.h
+++ b/kernel/src/bbtkVirtualExec.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkVirtualExec.h,v $ $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/07 08:40:14 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,36 +28,42 @@
 #define __bbtkVirtualExec_h__
 
 #include "bbtkSystem.h"
-#include "bbtkComplexBlackBox.h"
+//#include "bbtkComplexBlackBox.h"
 #include "bbtkFactory.h"
-#include <string>
-#include <deque>
+//#include <string>
+//#include <deque>
 
 namespace bbtk
 {
 
+  class Interpreter;
+
   class /*BBTK_EXPORT*/ VirtualExec   // All methods are pure virtual
   {
 
   public:
-    typedef enum 
+    typedef enum
     {
        NoDialog,
        TextDialog,
        GraphicalDialog
     }
     DialogModeType;
+
+    VirtualExec() : mInterpreter(0) {}
+
+    /// Sets the interpreter who uses it 
+    void SetInterpreter(Interpreter* i) { mInterpreter = i; }
+    /// Gets the interpreter who uses it 
+    Interpreter* GetInterpreter() { return mInterpreter; }
+    /// Gets the interpreter who uses it (const)
+    const Interpreter* GetInterpreter() const { return mInterpreter; }
+
+    /// Gets the factory used by the executer
+    virtual Factory* GetFactory() { return 0; }
+    /// Gets the factory used by the executer (const)
+    virtual const Factory* GetFactory() const { return 0; }
     
-/*
-    /// Constructor
-    VirtualExec();
-
-    /// 
-    //  void SetFactory(Factory* f);
-      
-    /// Destructor
-    virtual ~VirtualExec() = 0;
-*/    
     /// Sets the inputs of the workspace : 
     virtual void SetInputs(const std::map<std::string,std::string>& m) = 0;
 
@@ -70,11 +76,21 @@ namespace bbtk
     /// Sets the mode of dialog of the executer for Root inputs 
     virtual void SetDialogMode(DialogModeType t) = 0;
 
+    /// Starts a package block	
+    virtual void BeginPackage (const std::string &name ) = 0;
+
+    /// Ends a package block
+    virtual void EndPackage () = 0;
+
     /// Starts the definition of a new ComplexBlackBox in package pack
     /// scriptfilename is the file from which the def is read
     virtual void Define (const std::string &name,
 		 const std::string& pack,
 		 const std::string &scriptfilename) = 0;
+ 
+    /// Sets the file name to use for the current definition
+    /// (Used to set it after the Define command)
+    virtual void SetCurrentFileName (const std::string &name ) = 0;
 
     /// End the definition of a ComplexBlackBox
     virtual void EndDefine () = 0;
@@ -113,18 +129,21 @@ namespace bbtk
 	      const std::string &input, 
 	      const std::string &value) = 0;
 
-   /// gets the output of the box
+    /// gets the output of the box
     virtual std::string Get (const std::string &box, 
 		     const std::string &output) = 0;
 
     /// changes the workspace name
     virtual void SetWorkspaceName( const std::string& n ) = 0;
 
-    ///Adds the authorName to the Box's author list
+    ///Adds the authorName to the Box author list
     virtual void Author(const std::string &authorName) = 0;
 
+    ///Adds the categories to the Box categoris list
+    virtual void Category(const std::string &categories) = 0;
+
     /// The description string which explains what does the ComplexBox
-    virtual void Description(const std::string & d) = 0;
+    virtual void Description(const std::string &d) = 0;
 
     /// prints the list off the boxes of the current box
     virtual void PrintBoxes() = 0;
@@ -138,21 +157,24 @@ namespace bbtk
 			  const std::string &custom_title,
 			  bool system_display = true) = 0;
 
-	/// Generate a HTML with a gif file with the actual pipeline (Graphviz-dot needed). Returns the file path
+   /// Generate a HTML with a gif file with the actual pipeline (Graphviz-dot needed). Returns the file path
     virtual std::string ShowGraphInstances(const std::string &nameblackbox, int detail, int level, bool system_display=true) = 0;
 
-/// Description of the actual pipeline
+   /// Description of the actual pipeline
 	virtual void ShowRelations(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr) = 0;
 
 	virtual void Reset() = 0;
-/*
+
+
   //  static const std::string& GetObjectDescription() = 0;
   //  { static std::string s("VirtualExec"); return s; }
-*/
   protected:
 
   private:
 
+   /// The interpreter which uses it (0 if none)
+    Interpreter* mInterpreter;
+    /*
     /// Gets the current working black box 
     virtual ComplexBlackBoxDescriptor* Current() = 0;
     
@@ -171,7 +193,7 @@ namespace bbtk
     /// The root ComplexBlackBox, in which operations are done when outside a define/endefine block
     /// Its name in bbi is 'workspace'  
     ComplexBlackBoxDescriptor* mRoot;
-    
+
     /// Struct that stores info on user defined complex black boxes
     struct CBBDefinition
     {
@@ -184,7 +206,11 @@ namespace bbtk
     /// The stack of current working ComplexBlackBox
     /// (is a stack for nested definitions)
     /// only contains the root when outside a define/endefine block
-    std::deque<CBBDefinition> mCurrent;
+    std::deque<CBBDefinition> mOpenDefinition;
+
+   /// The stack of current working package
+    /// (is a stack for nested definitions)
+    std::deque<Package*> mOpenPackage;
 
     /// flag which is true when we are inside a Define/EndDefine block
     //    bool mDefineFlag;
@@ -197,6 +223,7 @@ namespace bbtk
 
     /// Dialog mode
     DialogModeType mDialogMode;
+    */
   };
 }
 #endif