No longer 'Categories', only 'Kinds'!

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

diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h
index 42217a7a1c88b3c53f7fa39121b34da6ab76891c..6a744012f1692f50a8266963ab600585956d5afe 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/01/30 09:28:16 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/02/05 11:07:43 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,24 +40,14 @@ namespace bbtk
   {
 
   public:
-    typedef enum 
+    typedef enum
     {
        NoDialog,
        TextDialog,
        GraphicalDialog
     }
     DialogModeType;
-    
-/*
-    /// 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;
 
@@ -119,7 +109,7 @@ 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;
 
@@ -147,17 +137,17 @@ 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:
@@ -180,7 +170,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
     {
@@ -193,7 +183,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;