=== MAJOR RELEASE ====

[bbtk.git] / kernel / src / bbtkVirtualExec.h

diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h
index e736f9e8c7a8cf40c29f6b6f411f3054046b9b6d..cc2d81b547a170aad6b09fa1fd4d66f683d2e0da 100644 (file)
--- 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/04/08 06:59:30 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2008/04/18 12:59:16 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,19 +28,18 @@
 #define __bbtkVirtualExec_h__
 
 #include "bbtkSystem.h"
-//#include "bbtkComplexBlackBox.h"
+#include "bbtkComplexBlackBoxDescriptor.h"
 #include "bbtkFactory.h"
-//#include <string>
-//#include <deque>
 
 namespace bbtk
 {
 
   class Interpreter;
+  BBTK_FORWARD_DECLARE_POINTER(Interpreter);
 
-  class /*BBTK_EXPORT*/ VirtualExec   // All methods are pure virtual
+  class /*BBTK_EXPORT*/ VirtualExec : public Object
   {
-
+    BBTK_ABSTRACT_OBJECT_INTERFACE(VirtualExec);
   public:
     typedef enum
     {
@@ -50,21 +49,18 @@ namespace bbtk
     }
     DialogModeType;
 
-    VirtualExec() : mInterpreter(0) {}
-
-    virtual ~VirtualExec() {}
 
     /// Sets the interpreter who uses it 
-    void SetInterpreter(Interpreter* i) { mInterpreter = i; }
+    void SetInterpreter(InterpreterPointer i) { mInterpreter = i; }
     /// Gets the interpreter who uses it 
-    Interpreter* GetInterpreter() { return mInterpreter; }
+    InterpreterPointer GetInterpreter(); // { return mInterpreter.lock(); }
     /// Gets the interpreter who uses it (const)
-    const Interpreter* GetInterpreter() const { return mInterpreter; }
+    //    const Interpreter::Pointer GetInterpreter() const { return mInterpreter; }
 
     /// Gets the factory used by the executer
-    virtual Factory* GetFactory() { return 0; }
+    virtual Factory::Pointer GetFactory() { return Factory::Pointer(); }
     /// Gets the factory used by the executer (const)
-    virtual const Factory* GetFactory() const { return 0; }
+    // virtual const Factory* GetFactory() const { return 0; }
     
     /// Sets the inputs of the workspace : 
     virtual void SetInputs(const std::map<std::string,std::string>& m) = 0;
@@ -185,7 +181,9 @@ namespace bbtk
     /// Prints the string ... MORE : TO EXPLAIN 
     virtual void Print(const std::string & message) = 0;
 
-    
+    ComplexBlackBoxDescriptor::Pointer GetWorkspace() 
+    { return  ComplexBlackBoxDescriptor::Pointer(); }
+  
   //  static const std::string& GetObjectDescription() = 0;
   //  { static std::string s("VirtualExec"); return s; }
   protected:
@@ -193,57 +191,8 @@ namespace bbtk
   private:
 
    /// The interpreter which uses it (0 if none)
-    Interpreter* mInterpreter;
-    /*
-    /// Gets the current working black box 
-    virtual ComplexBlackBoxDescriptor* Current() = 0;
-    
-    /// Returns true when we are inside a define/endefine block
-    //    virtual bool InDefinitionBlock() = 0;
-
-    //==================================================================
-    // ATTRIBUTES
-     
-    /// The factory used
-    //   Factory* mFactory;
-
-    /// The Root Package
-    Package* mPackage;
-    
-    /// 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
-    {
-      ComplexBlackBoxDescriptor* box;
-      std::string package;
-      CBBDefinition(ComplexBlackBoxDescriptor* d, const std::string& p )
-        : box(d), package(p) {}
-    };
-
-    /// 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> 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;
-    
-    /// The input values of the Root ComplexBlackBox
-    std::map<std::string,std::string> mInputs;
-    
-    /// no exec mode flag
-    bool mNoExecMode;
+    InterpreterWeakPointer mInterpreter;
 
-    /// Dialog mode
-    DialogModeType mDialogMode;
-    */
   };
 }
 #endif