X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=2bb24d8e12b8eec87092a6d6b6056a061313c206;hb=dfd2ff30bc71b28174b0f5d49380648e11d58f0a;hp=8348d062a47182452edb6871997a98b50749de8d;hpb=71376d8384d5d21b5c56d36ecc8cbf31315c039a;p=bbtk.git

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 8348d06..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 13:23:46 $
-  Version:   $Revision: 1.7 $
+  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
@@ -159,6 +159,14 @@ namespace bbtk
     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("Kernel",9,"Executer::EndDefine(\""
@@ -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 + "\"");