X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2Fbbi%2Fbbi.cxx;h=48951bd0d4ebf2d52096a72d60708769ab9ad50a;hb=19a1e7a2f298bfdfee13893f98272de4e6d0f7f2;hp=1d92d7e533f488feba3d2ae13199148728435c69;hpb=28300312b87bd50ca689d497c5a500ad4d343d5d;p=bbtk.git diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx index 1d92d7e..48951bd 100644 --- a/kernel/appli/bbi/bbi.cxx +++ b/kernel/appli/bbi/bbi.cxx @@ -3,6 +3,7 @@ //========================================================================== // WITH WX //========================================================================== +#include "bbtkObject.h" #include "bbtkInterpreter.h" #include "bbtkWxBlackBox.h" #include "bbtkWxGUIConsole.h" @@ -14,15 +15,15 @@ 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 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_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 } }; @@ -34,6 +35,7 @@ public: bool OnInit( ); int OnExit() { // std::cout << "wxBBIApp::OnExit()"< argv; - bool command; + bool console; bool debug; bool quiet; bool help; bool graphical_dialog; bool text_dialog; - bool no_command; - bool no_command_at_all; + bool no_console; std::map param_map; std::vector input_file; @@ -66,14 +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_at_all = ( parser.Found(_T("N")) ); - no_command = ( parser.Found(_T("n")) || no_command_at_all ); - + no_console = ( parser.Found(_T("N")) ); // parse the arguments and consider those which contain a "=" // as set input commands, other as files @@ -104,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) ) ); @@ -116,6 +122,9 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser) + + + // ---------------------------------------------------------------------------- // The `main program' equivalent, creating the windows and returning the // main frame @@ -128,21 +137,23 @@ bool wxBBIApp::OnInit( ) setlocale(LC_NUMERIC, "C"); #endif - if (quiet) bbtk::MessageManager::SetMessageLevel("All",0); - if (debug) bbtk::MessageManager::SetMessageLevel("All",9); + + if (quiet) bbtk::MessageManager::SetMessageLevel("max",0); + if (debug) bbtk::MessageManager::SetMessageLevel("all",9); 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::const_iterator i; bool error = false; @@ -152,7 +163,7 @@ bool wxBBIApp::OnInit( ) error = ! I->InterpretFile(*i); if (error) break; } - bool show_on_error = error && ! no_command_at_all; + bool show_on_error = error && ! no_console; if (show_on_error) I->Show(); I->SetNoExecMode(false); @@ -163,7 +174,7 @@ bool wxBBIApp::OnInit( ) I->GetInterpreter()->GetExecuter()->GetFactory()->HelpBlackBox("workspace",package,false); } - if (!(show_on_error || command || bbtk::Wx::IsSomeWindowShown() )) + if (!(show_on_error || console || bbtk::Wx::IsSomeWindowShown() )) { I->Close(); }