X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=2bb24d8e12b8eec87092a6d6b6056a061313c206;hb=7eba604321498f7ed6333b7cbe9bf2aceb4ec30e;hp=fe1e36d98538b4a0a85777f6e18e2c29be6eabc9;hpb=998354bb81a4f450cae3a2263838d7d3b6024bac;p=bbtk.git

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index fe1e36d..2bb24d8 100644
--- 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/06 10:53:02 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,9 +47,9 @@ namespace bbtk
   {
     //VirtualExec();
     
-    bbtkDebugMessageInc("Core",9,"Executer::Executer()" <<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Executer::Executer()" <<std::endl);
     Reset();
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   } 
 
 /**
@@ -57,7 +57,7 @@ namespace bbtk
  */
   Executer::~Executer()
   {
-     bbtkDebugMessageInc("Core",9,"Executer::~Executer()" <<std::endl);
+     bbtkDebugMessageInc("Kernel",9,"Executer::~Executer()" <<std::endl);
      if (mRoot) 
      {
         mPackage->UnRegisterBlackBox("workspace");
@@ -67,7 +67,7 @@ namespace bbtk
      {
         GetGlobalFactory()->UnLoadPackage("user");
      }
-     bbtkDebugDecTab("Core",9);
+     bbtkDebugDecTab("Kernel",9);
   }
   
 
@@ -76,7 +76,7 @@ namespace bbtk
  */
   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!
@@ -109,7 +109,7 @@ 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
@@ -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,20 @@ 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 ?
@@ -429,14 +437,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" ;
@@ -498,16 +506,16 @@ 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"; 
+	directory = directory +  "temp_dir"; 
 	
-	//std::string directory("doc_tmp");
+	//std::string directory("temp_dir");
 	std::string filename(directory + "/" + "bbtk_graph_pipeline");
 	std::string filename_html(filename+".html");
 	std::string command0("mkdir \""+directory + "\"");