X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=kernel%2Fsrc%2FbbtkExecuter.h;h=0090fada1a4e141b9c1746b5e6954914ccc32064;hb=cbdd914a561bf6241a5b56d66873e090db933f8b;hp=be6099a40643627533bc3cc4b23449b9855d4efb;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkExecuter.h b/kernel/src/bbtkExecuter.h
index be6099a..0090fad 100644
--- a/kernel/src/bbtkExecuter.h
+++ b/kernel/src/bbtkExecuter.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.h,v $ $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/06 10:53:02 $
+  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
@@ -23,7 +23,7 @@
  *  \class bbtk::Executer 
  *  \brief class Executer: level 0 of script execution 
  */
-  
+ 
 #ifndef __bbtkExecuter_h__
 #define __bbtkExecuter_h__
 
@@ -43,22 +43,12 @@ namespace bbtk
 
   public:
 
-  /*
-   typedef enum 
-    {
-      NoDialog,
-      TextDialog,
-      GraphicalDialog
-    }
-    DialogModeType;
-*/    
-
     /// Constructor
     Executer();
 
-    /// 
+    ///
     //  void SetFactory(Factory* f);
-      
+
     /// Destructor
     ~Executer();
     
@@ -74,12 +64,22 @@ namespace bbtk
     /// Sets the mode of dialog of the executer for Root inputs 
     void SetDialogMode(DialogModeType t) { mDialogMode = t; }
 
+    /// Starts a package block	
+    void BeginPackage (const std::string &name );
+
+    /// Ends a package block
+    void EndPackage ();
+
     /// Starts the definition of a new ComplexBlackBox in package pack
     /// scriptfilename is the file from which the def is read
     void Define (const std::string &name,
 		 const std::string& pack,
 		 const std::string &scriptfilename);
 
+    /// Sets the file name to use for the current definition
+    /// (Used to set it after the Define command)
+    void SetCurrentFileName (const std::string &name );
+    
     /// End the definition of a ComplexBlackBox
     void EndDefine ();
 
@@ -123,9 +123,12 @@ namespace bbtk
     /// changes the workspace name
     void SetWorkspaceName( const std::string& n );
 
-    ///Adds the authorName to the Box's author list
+    ///Adds the authorName to the Box author list
     void Author(const std::string &authorName);
 
+    ///Adds the Categories to the Box category list
+    void Category(const std::string &category);
+
     /// The description string which explains what does the ComplexBox
     void Description(const std::string & d);
 
@@ -149,7 +152,7 @@ namespace bbtk
 
       void Reset();
 
-  //  static const std::string& GetObjectDescription() 
+  //  static const std::string& GetObjectDescription();
   //  { static std::string s("Executer"); return s; }
 
   protected:
@@ -157,10 +160,11 @@ namespace bbtk
   private:
 
     /// Gets the current working black box 
-    ComplexBlackBoxDescriptor* Current() { return mCurrent.back().box; }
+    ComplexBlackBoxDescriptor* Current() 
+	{ return mOpenDefinition.back().box; }
     
     /// Returns true when we are inside a define/endefine block
-    //    bool InDefinitionBlock() { return (mCurrent.size()>1); }
+    //    bool InDefinitionBlock() { return (mOpenDefinition.size()>1); }
 
     //==================================================================
     // ATTRIBUTES
@@ -174,7 +178,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
     {
@@ -187,7 +191,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;