Add unfinished version of bbtkTranscriptor

[bbtk.git] / kernel / src / bbtkExecuter.cxx

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index fe1e36d98538b4a0a85777f6e18e2c29be6eabc9..7564baf85337198a81111d65f2c6478aef454ea2 100644 (file)
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:16:55 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/02/14 11:38:58 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@
 namespace bbtk
 {  
 /**
- *  
+ *
  */
   Executer::Executer()
     : mPackage(0),
@@ -47,36 +47,36 @@ namespace bbtk
   {
     //VirtualExec();
     
-    bbtkDebugMessageInc("Core",9,"Executer::Executer()" <<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Executer::Executer()" <<std::endl);
     Reset();
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   } 
 
 /**
- *  
+ *
  */
   Executer::~Executer()
   {
-     bbtkDebugMessageInc("Core",9,"Executer::~Executer()" <<std::endl);
+     bbtkDebugMessageInc("Kernel",9,"Executer::~Executer()" <<std::endl);
      if (mRoot) 
      {
         mPackage->UnRegisterBlackBox("workspace");
-        delete mRoot;    
+        delete mRoot;
      }
-     if (mPackage) 
+     if (mPackage)
      {
         GetGlobalFactory()->UnLoadPackage("user");
      }
-     bbtkDebugDecTab("Core",9);
+     bbtkDebugDecTab("Kernel",9);
   }
   
 
 /**
- *  
+ *
  */
   void Executer::Reset()
   {
-    bbtkDebugMessageInc("Core",9,"Executer::Reset()" <<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Executer::Reset()" <<std::endl);
 
     // The 'user' package must be closed before all other 
     // because box destructors must not be unloaded when bb are deleted!
@@ -84,10 +84,10 @@ namespace bbtk
     // all user defined CBB otherwise any instance 
     // of a user CBB that is in the 'workspace' would try to 
     // access a user CBB descriptor which has been previously freed
-    if (mRoot) 
+    if (mRoot)
     {
        mPackage->UnRegisterBlackBox(mRoot->GetTypeName());
-       delete mRoot;    
+       delete mRoot;
     }
     if (mPackage) 
     {
@@ -109,9 +109,9 @@ namespace bbtk
     // Insert the user package in the factory
     InsertPackage(mPackage);
     mOpenPackage.push_back(mPackage);
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
-  
+
   /// changes the workspace name
   void Executer::SetWorkspaceName( const std::string& n )
   {
@@ -120,7 +120,7 @@ namespace bbtk
   
   void Executer::BeginPackage (const std::string &name)
   {
-     bbtkDebugMessageInc("Core",9,"Executer::BeginPackage(\""<<name<<"\")"
+     bbtkDebugMessageInc("Kernel",9,"Executer::BeginPackage(\""<<name<<"\")"
                         <<std::endl);
      Package* p;
      try 
@@ -148,7 +148,7 @@ namespace bbtk
                         const std::string &pack,
                         const std::string &scriptfilename)
   {
-    bbtkDebugMessageInc("Core",9,"Executer::Define(\""<<name<<
+    bbtkDebugMessageInc("Kernel",9,"Executer::Define(\""<<name<<
                        ","<<pack<<"\")" 
                         <<std::endl);
 
@@ -156,12 +156,19 @@ namespace bbtk
     b->SetScriptFileName(scriptfilename);
     mOpenDefinition.push_back( CBBDefinition( b, pack ) );
     
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
+  }
+
+  /// Sets the file name to use for the current definition
+  /// (Used to set it after the Define command)
+  void Executer::SetCurrentFileName (const std::string &name )
+  {
+    mOpenDefinition.back().box->SetScriptFileName(name);
   }
 
   void Executer::EndDefine ()
   {
-    bbtkDebugMessageInc("Core",9,"Executer::EndDefine(\""
+    bbtkDebugMessageInc("Kernel",9,"Executer::EndDefine(\""
                         <<Current()->GetTypeName()<<"\")" 
                         <<std::endl);
     // Does current package exist ?
@@ -198,20 +205,19 @@ namespace bbtk
   {
      Current()->Add(nodeType,nodeName);
   }
-  
 
   /*
     void Executer::Remove (const std::string &nodeName)
   {
     // Current()->RemoveBlackBox(nodeName);
   }
-  */    
+  */
 
 /**
- *  
+ *
  */
   void Executer::Connect (const std::string &nodeFrom, 
-                          const std::string &outputLabel, 
+                          const std::string &outputLabel,
                           const std::string &nodeTo, 
                           const std::string &inputLabel)
   {
@@ -219,7 +225,7 @@ namespace bbtk
   }
 
  /**
- *  
+ *
  */ 
   void Executer::Update (const std::string &nodeName) // would 'Execute' be more meaningfull ?
   {
@@ -236,9 +242,9 @@ namespace bbtk
         Current()->AddToExecutionList(nodeName) ;
      }
   }
-    
+
 /**
- *  
+ *
  */
   void Executer::DefineInput ( const std::string &name,
                                const std::string &box,
@@ -282,7 +288,6 @@ namespace bbtk
           mess += ")";
           std::string title(name);
           title += " ?";
-    
           std::string ans = wx2std ( wxGetTextFromUser( std2wx (mess), std2wx(title)));
           Set(box,input,ans); 
        }
@@ -292,7 +297,7 @@ namespace bbtk
     Current()->DefineInput(name,box,input,help);
 
   }
-  
+
  /**
  *  
  */ 
@@ -340,8 +345,8 @@ namespace bbtk
   }
 
   /**
-   *  
-   */ 
+   *
+   */
   std::string Executer::Get(const std::string &box,
                             const std::string &output)
   {
@@ -373,7 +378,7 @@ namespace bbtk
         a->bbDelete();
         return r;
       }
-    else 
+    else
       {
        b->bbExecute();
        return b->bbGetOutput(output).unsafe_get<std::string>();
@@ -429,14 +434,14 @@ namespace bbtk
     // No output provided : automatic generation
     if (output_html.length() == 0)
       {
-       // Don't pollute the file store with  "doc_tmp" directories ...    
-       std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_doc_tmp();
+       // Don't pollute the file store with  "temp_dir" directories ...    
+       std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
        
        char c = default_doc_dir.c_str()[strlen(default_doc_dir.c_str())-1];
        
        std::string directory = default_doc_dir; 
        if (c != '/' && c !='\\') directory = directory + "/";
-       directory = directory +  "doc_tmp";    
+       directory = directory +  "temp_dir";    
        
        filename_rootHtml = directory + "/" + "User.html";
        simplefilename_rootHtml = "User.html" ;
@@ -489,7 +494,7 @@ namespace bbtk
     {
          blackbox=Current()->GetPrototype();
     }
-    else 
+    else
     {
          blackbox = Current()->GetPrototype()->bbFindBlackBox(nameblackbox);
     }
@@ -498,21 +503,20 @@ namespace bbtk
 
     if (blackbox)
       {      
-       // Don't pollute the file store with  "doc_tmp" directories ...    
-       std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_doc_tmp();
+       // Don't pollute the file store with  "temp_dir" directories ...
+       std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
        char c = default_doc_dir.c_str()[strlen(default_doc_dir.c_str())-1];
-       
+
        std::string directory = default_doc_dir; 
        if (c != '/' && c !='\\') directory = directory + "/";
 
-       directory = directory +  "doc_tmp"; 
-       
-       //std::string directory("doc_tmp");
+       directory = directory +  "temp_dir";
+       //std::string directory("temp_dir");
        std::string filename(directory + "/" + "bbtk_graph_pipeline");
        std::string filename_html(filename+".html");
        std::string command0("mkdir \""+directory + "\"");
 
-#if defined(_WIN32)  
+#if defined(_WIN32)
        std::string command2("start ");
 #else 
        std::string command2("gnome-open ");
@@ -535,7 +539,7 @@ namespace bbtk
            } 
 
            blackbox->bbInsertHTMLGraph( s, detail, level, true, directory, false );
-           s << "</body></html>\n";      
+           s << "</body></html>\n";
          }
        s.close();
        
@@ -546,7 +550,6 @@ namespace bbtk
       {
        bbtkMessageInc("Help",1,"No black box: \""
                       <<nameblackbox<<"\" " <<std::endl);
-       
       }
     return page;
   }