Fixed :

[bbtk.git] / kernel / appli / bbi / bbi.cxx

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index 39fcc08b5026c5cb737886af15636ab42d95f9a0..1d92d7e533f488feba3d2ae13199148728435c69 100644 (file)
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -5,7 +5,7 @@
 //==========================================================================
 #include "bbtkInterpreter.h"
 #include "bbtkWxBlackBox.h"
-#include "bbtkWxConsole.h"
+#include "bbtkWxGUIConsole.h"
 
 #include <wx/cmdline.h>
 #include <vector>
@@ -14,12 +14,14 @@
 
 static const wxCmdLineEntryDesc cmdLineDesc[] =
 {
+  { wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("Debug messages on (message All 9)") },
   { wxCMD_LINE_SWITCH, _T("c"), _T("command"), _T("turn to command line mode after file(s) processing") },
   { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"),   _T("be quiet") },
   { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("print help") },
   { wxCMD_LINE_SWITCH, _T("g"), _T("graphical-dialog"),   _T("prompts the user for the parameters values using dialog boxes") },
   { wxCMD_LINE_SWITCH, _T("t"), _T("text-dialog"),   _T("prompts the user for the parameters values in text mode") },
-  { wxCMD_LINE_SWITCH, _T("n"), _T("no-command"),   _T("do not show command window") },
+  { wxCMD_LINE_SWITCH, _T("n"), _T("no-command"),   _T("do not show command window except on error") },
+  { wxCMD_LINE_SWITCH, _T("N"), _T("no-command-at-all"),   _T("do not show command window even on error") },
   { wxCMD_LINE_PARAM,  NULL, NULL, _T("input_file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
   { wxCMD_LINE_NONE }
 };
@@ -41,11 +43,13 @@ public:
   int argc;
   std::vector<std::string> argv;
   bool command;
+  bool debug;
   bool quiet;
   bool help;
   bool graphical_dialog;
   bool text_dialog;
   bool no_command;
+  bool no_command_at_all;
 
   std::map<std::string,std::string> param_map;
   std::vector<std::string> input_file;
@@ -62,11 +66,14 @@ void wxBBIApp::OnInitCmdLine(wxCmdLineParser& parser)
 
 bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 {
+  debug = ( parser.Found(_T("d")) );
   quiet = ( parser.Found(_T("q")) );
   help = ( parser.Found(_T("h")) );
   graphical_dialog = ( parser.Found(_T("g")) );
   text_dialog = ( parser.Found(_T("t")) );
-  no_command = ( parser.Found(_T("n")) );
+  no_command_at_all = ( parser.Found(_T("N")) );
+  no_command = ( parser.Found(_T("n")) || no_command_at_all );
+
 
   // parse the arguments and consider those which contain a "=" 
   // as set input commands, other as files
@@ -120,9 +127,12 @@ bool wxBBIApp::OnInit( )
   //See http://www.wxwindows.org/faqgtk.htm#locale
   setlocale(LC_NUMERIC, "C");
 #endif
+  
+  if (quiet) bbtk::MessageManager::SetMessageLevel("All",0);
+  if (debug) bbtk::MessageManager::SetMessageLevel("All",9);
+  
 
- 
-  bbtk::WxConsole *I = new bbtk::WxConsole(0,_T("bbi"),wxSize(600,400));
+  bbtk::WxGUIConsole *I = new bbtk::WxGUIConsole(0,_T("bbi"),wxSize(800,600));
   SetTopWindow(I);  
   if (!no_command) I->Show(true);
 
@@ -135,12 +145,25 @@ bool wxBBIApp::OnInit( )
   if (text_dialog) I->SetDialogMode(bbtk::Executer::TextDialog);
 
   std::vector<std::string>::const_iterator i;
-  for (i=input_file.begin(); i!=input_file.end(); ++i) I->InterpretFile(*i);
+  bool error = false;
+
+  for (i=input_file.begin(); i!=input_file.end(); ++i) 
+    {
+      error = ! I->InterpretFile(*i);
+      if (error) break;
+    }
+  bool show_on_error = error && ! no_command_at_all;
+  if (show_on_error) I->Show();
+
   I->SetNoExecMode(false);
 
-  if (help_on_script) bbtk::HelpBlackBox("workspace",false);
+  if (help_on_script) 
+    {
+      std::string package; 
+      I->GetInterpreter()->GetExecuter()->GetFactory()->HelpBlackBox("workspace",package,false);
+    }
 
-  if (!(command || bbtk::Wx::IsSomeWindowShown() ))
+  if (!(show_on_error || command || bbtk::Wx::IsSomeWindowShown() ))
     {
       I->Close();
     }