X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2Fbbi%2Fbbi.cxx;h=378c1f63eda4cfbefb1c229355b0b0dc7a3c7fbb;hb=54a7d70f44d627ee33821eebeeceb22e45023662;hp=39fcc08b5026c5cb737886af15636ab42d95f9a0;hpb=5ca30b861f60def2666a1c675e8b45df0a713f95;p=bbtk.git

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index 39fcc08..378c1f6 100644
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -3,9 +3,10 @@
 //==========================================================================
 // WITH WX
 //==========================================================================
+#include "bbtkObject.h"
 #include "bbtkInterpreter.h"
 #include "bbtkWxBlackBox.h"
-#include "bbtkWxConsole.h"
+#include "bbtkWxGUIConsole.h"
 
 #include <wx/cmdline.h>
 #include <vector>
@@ -14,13 +15,15 @@
 
 static const wxCmdLineEntryDesc cmdLineDesc[] =
 {
-  { 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_PARAM,  NULL, NULL, _T("input_file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
+  { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("print this help or help on the application defined in input bbs file if any") },
+  { wxCMD_LINE_SWITCH, _T("g"), _T("graphical-dialog"),   _T("prompt the input parameter values using graphical dialog") },
+  { wxCMD_LINE_SWITCH, _T("t"), _T("text-dialog"),   _T("prompt the input parameter values in text mode") },
+  { wxCMD_LINE_SWITCH, _T("c"), _T("console"), _T("open bbi console") },
+  { wxCMD_LINE_SWITCH, _T("N"), _T("no-console"),   _T("never open bbi console even on error") },
+  { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"),   _T("be quiet (='message max 0')") },
+  { wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("turn all messages on (='message all 9')") },
+  { wxCMD_LINE_SWITCH, _T("D"), _T("Debug"), _T("memory debug on exit (='debug -D')") },
+  { wxCMD_LINE_PARAM,  NULL, NULL, _T("file [file [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
   { wxCMD_LINE_NONE }
 };
 
@@ -32,6 +35,7 @@ public:
   bool OnInit( );
   int  OnExit() { 
     //    std::cout << "wxBBIApp::OnExit()"<<std::endl;
+    // bbtk::Object::PrintObjectListInfo();
     return true; }
   void OnInitCmdLine(wxCmdLineParser& parser);
   bool OnCmdLineParsed(wxCmdLineParser& parser);
@@ -40,12 +44,13 @@ public:
   bbtk::Interpreter* I;
   int argc;
   std::vector<std::string> argv;
-  bool command;
+  bool console;
+  bool debug;
   bool quiet;
   bool help;
   bool graphical_dialog;
   bool text_dialog;
-  bool no_command;
+  bool no_console;
 
   std::map<std::string,std::string> param_map;
   std::vector<std::string> input_file;
@@ -62,11 +67,19 @@ void wxBBIApp::OnInitCmdLine(wxCmdLineParser& parser)
 
 bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 {
+
+  if (parser.Found(_T("D"))) 
+    {
+      bbtk::StaticInitTime::PrintObjectListInfo = true;
+    }
+  
+  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_console = ( parser.Found(_T("N")) );
 
   // parse the arguments and consider those which contain a "=" 
   // as set input commands, other as files
@@ -97,9 +110,9 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
     parser.Usage();
   }
 
-  command = ( parser.Found(_T("c")) || 
+  console = ( parser.Found(_T("c")) || 
 	      ((input_file.size() == 0) && 
-	       (!no_command) &&
+	       (!no_console) &&
 	       (!usage) ) );
 
 
@@ -109,6 +122,9 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 
 
 
+
+
+
 // ----------------------------------------------------------------------------
 // The `main program' equivalent, creating the windows and returning the
 // main frame
@@ -120,29 +136,57 @@ bool wxBBIApp::OnInit( )
   //See http://www.wxwindows.org/faqgtk.htm#locale
   setlocale(LC_NUMERIC, "C");
 #endif
+  
+
+  if (quiet) bbtk::MessageManager::SetMessageLevel("max",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);
+  if (console) I->Show(true);
+
 
   I->SetInputs(param_map);
 
   bool help_on_script = help && (input_file.size() > 0);
   if (help_on_script) I->SetNoExecMode(true);
 
-  if (graphical_dialog) I->SetDialogMode(bbtk::Executer::GraphicalDialog);
-  if (text_dialog) I->SetDialogMode(bbtk::Executer::TextDialog);
+  if (graphical_dialog) I->SetDialogMode(bbtk::VirtualExec::GraphicalDialog);
+  if (text_dialog) I->SetDialogMode(bbtk::VirtualExec::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_console;
+  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() ))
+  /*
+  std::cout << "soe="<<show_on_error <<std::endl;
+  std::cout << "con="<<console<<std::endl;
+  std::cout << "iws="<<bbtk::Wx::IsSomeWindowShown()<<std::endl;
+  */
+  if (!(show_on_error || console || bbtk::Wx::IsSomeWindowShown() ))
     {
       I->Close();
+      //      std::cout << "I->Close"<<std::endl;
+    }
+  else 
+    {
+      //      std::cout << "!I->Close"<<std::endl;
     }
   return true;