X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkTranscriptor.h;h=3d819ce9b2c4a4a5c0b6f5016b2602c860109543;hb=6ea571ab3b7a539aaaca066db3941f5017920209;hp=5ab590a956df924e2fbb9414be54f324ca0c3b6b;hpb=a914433b82d5681eadfb1612306c707104c03576;p=bbtk.git

diff --git a/kernel/src/bbtkTranscriptor.h b/kernel/src/bbtkTranscriptor.h
index 5ab590a..3d819ce 100644
--- a/kernel/src/bbtkTranscriptor.h
+++ b/kernel/src/bbtkTranscriptor.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkTranscriptor.h,v $ $
   Language:  C++
-  Date:      $Date: 2008/01/22 17:00:17 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/20 11:58:32 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,10 +25,15 @@
  */
  
 #ifndef __bbtkTranscriptor_h__
-#define __bbtkTranscriptor_h__ 
+#define __bbtkTranscriptor_h__
 
 #include "bbtkVirtualExec.h"
 
+#include "bbtkSystem.h"
+#include "bbtkComplexBlackBox.h"
+#include "bbtkFactory.h"
+#include <string>
+#include <deque>
 #include <iostream>
 
 namespace bbtk
@@ -37,14 +42,14 @@ namespace bbtk
   class /*BBTK_EXPORT*/ Transcriptor : public VirtualExec
   {
 
-  public:  
+  public:
 
     /// Constructor
     Transcriptor(std::string filename);
-      
+
     /// Destructor
     ~Transcriptor( );
-    
+   
     /// Sets the inputs of the workspace : 
     void SetInputs(const std::map<std::string,std::string>& m) { mInputs = m; }
 
@@ -54,26 +59,39 @@ namespace bbtk
     //void SetNoExecMode(bool b) { mNoExecMode = b; }
     void SetNoExecMode(bool b)
     {
-       m_Fp << "e->SetNoExecMode(true);" << std::endl;      
-    }    
+       if (b)
+          m_Fp << "  e->SetNoExecMode(true);" << std::endl;
+       else
+          m_Fp << "  e->SetNoExecMode(false);" << std::endl;       
+    }
 
     bool GetNoExecMode() const { return mNoExecMode; }
     /*
-    bool GetNoExecMode() const 
+    bool GetNoExecMode() const
     {
       // cannot compile, since ethos is 'const' !
-      //m_Fp << "e->GetNoExecMode(true);" << std::endl;      
+      //m_Fp << "e->GetNoExecMode(true);" << std::endl;
     }
     */
     /// 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 ();
 
@@ -117,9 +135,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);
 
@@ -143,7 +164,7 @@ namespace bbtk
 
       void Reset();
 
-  //  static const std::string& GetObjectDescription() 
+  //  static const std::string& GetObjectDescription()
   //  { static std::string s("Executer"); return s; }
 
   protected:
@@ -151,10 +172,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
@@ -168,7 +190,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
     {
@@ -181,7 +203,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;
@@ -196,8 +222,8 @@ namespace bbtk
     DialogModeType mDialogMode;
     
     /// File Pointer, to hold generated C++ code.
-   // std::ofstream *m_Fp;
-   std::ofstream m_Fp;
+    // std::ofstream *m_Fp;
+    std::ofstream m_Fp;
   };
 }
 #endif