X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=f0617c087e76bd851916bbfabb8d9032e4264f32;hb=82709d667857071eb7211e7fe7d22237d3a9ddf3;hp=dfea3e87dbc8487d9aeb4777f83d1a99bdfa0af5;hpb=2769d3123cddecf9d220bd5458d9e2855f298006;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index dfea3e8..f0617c0 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/02/06 09:27:52 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2008/02/12 12:55:16 $
+  Version:   $Revision: 1.29 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -54,6 +54,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
 
     //    mFactory = new bbtk::Factory();
     mExecuter = new bbtk::Executer();
+    //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt");
     //mExecuter->SetFactory(mFactory);
 
     // Builds the commands dict
@@ -225,7 +226,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmax = 2;
     info.code = cInclude;
     info.syntax = "include <filename> [source]";
-    info.help = "Includes the file <filename>.\n Advanced (used to get the right 'Include' field in doc of packages appli) : If the keyword 'source' is provided then informs bbi that the included file is the source of the current box definition.";
+    info.help = "Includes the file <filename>.\n  'source' : If the keyword 'source' is provided then informs bbi that the included file is the source of the current box definition (Advanced; used to get the right 'Include' field in html doc of packages 'appli' scripts).";
     mCommandDict[info.category] = info;
 
     info.category = "quit";
@@ -297,7 +298,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    *  
    */
   void Interpreter::InterpretFile( const std::string& filename,  
-				   bool use_configuration_file)
+                                   bool use_configuration_file)
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
@@ -749,7 +750,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // It's a user intended message.
         // Please don't remove it.
       bbtkMessage("Interpreter",1,
-		  "look for : [" << name 
+		  "look for : [" << name
 		  << "] (use_configuration_file == TRUE)" << std::endl);
       script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
     }
@@ -1082,26 +1083,50 @@ void Interpreter::Help(const std::vector<std::string>& words)
          try 
          {
             HelpPackage(words[1]);
+#ifdef _USE_WXWIDGETS_
+	    if ( WxConsole::GetInstance() != 0 )
+	      {
+		std::string url = ConfigurationFile::GetInstance().Get_url();
+		url += "/bbdoc/" + words[1] + "/index.html";
+		if (Utilities::FileExists(url)) 
+		  {
+		    WxConsole::GetInstance()->ShowHtmlPage(url);
+		  }
+	      }
+#endif	    
          }
          catch (bbtk::Exception f) 
          {
             try 
             {
-               HelpBlackBox(words[1]);
-            }
-           catch (bbtk::Exception g) 
-           {
-              try
-              {
-                 this->mExecuter->ShowRelations(words[1],"0","9999");
-              }
-              catch (bbtk::Exception h){
-                bbtkError("\""<<words[1].c_str()
-                          <<"\" is not a known command, package, black box type or black box name");
-              }
-           }
+	      std::string package;
+	      HelpBlackBox(words[1],package);
+#ifdef _USE_WXWIDGETS_
+	       if ( WxConsole::GetInstance() != 0 )
+		 {
+		   std::string url = ConfigurationFile::GetInstance().Get_url();
+		   url += "/bbdoc/" + package + "/index.html";
+		   if (Utilities::FileExists(url)) 
+		     {
+		       url += "#" + words[1];
+		       WxConsole::GetInstance()->ShowHtmlPage(url);
+		     }
+		 }
+#endif	    
+	    }
+	    catch (bbtk::Exception g) 
+	      {
+		try
+		  {
+		    this->mExecuter->ShowRelations(words[1],"0","9999");
+		  }
+		catch (bbtk::Exception h){
+		  bbtkError("\""<<words[1].c_str()
+			    <<"\" is not a known command, package, black box type or black box name");
+		}
+	      }
          }
-       }
+      }
     }
     else if (nbarg==2) 
     {
@@ -1145,7 +1170,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     const std::string description               = cf.Get_description();
     const std::string url                       = cf.Get_url();
     const std::string data_path                 = cf.Get_data_path();
-    const std::string default_doc_tmp           = cf.Get_default_doc_tmp();    
+    const std::string default_temp_dir          = cf.Get_default_temp_dir();    
     const std::string file_separator            = cf.Get_file_separator();    
     const std::vector<std::string>bbs_paths     = cf.Get_bbs_paths();
     const std::vector<std::string>package_paths = cf.Get_package_paths();
@@ -1156,7 +1181,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     bbtkMessage("Help",1, "bbtk_config.xml   : [" << config_xml_full_path  << "]" << std::endl); 
     bbtkMessage("Help",1, "Documentation Url : [" << url             << "]" << std::endl);
     bbtkMessage("Help",1, "Data Path         : [" << data_path       << "]" << std::endl);
-    bbtkMessage("Help",1, "Default Doc_tmp   : [" << default_doc_tmp << "]" << std::endl);
+    bbtkMessage("Help",1, "Default Temp-Dir  : [" << default_temp_dir << "]" << std::endl);
     bbtkMessage("Help",1, "File Separator    : [" << file_separator  << "]" << std::endl);
 
     std::vector<std::string>::const_iterator i;