X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2Fbbi%2Fbbi.cxx;h=891ffbfcde3cdda7dbc2799ee9f79a7ed285311e;hb=ec331bfd72e99a47d47c915143a355df274a882b;hp=48951bd0d4ebf2d52096a72d60708769ab9ad50a;hpb=603bd2accf3811a7c49caa53b795edde11cbc710;p=bbtk.git

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index 48951bd..891ffbf 100644
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -12,7 +12,8 @@
 #include <vector>
 #include <map>
 
-
+//==========================================================================
+// Command line options definition
 static const wxCmdLineEntryDesc cmdLineDesc[] =
 {
   { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("print this help or help on the application defined in input bbs file if any") },
@@ -26,23 +27,16 @@ static const wxCmdLineEntryDesc cmdLineDesc[] =
   { wxCMD_LINE_PARAM,  NULL, NULL, _T("file [file [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
   { wxCMD_LINE_NONE }
 };
+//==========================================================================
 
-
-
-class wxBBIApp : public wxApp
+//==========================================================================
+// Processes the command line parsing result
+struct WxProcessCmdLine
 {
-public:
-  bool OnInit( );
-  int  OnExit() { 
-    //    std::cout << "wxBBIApp::OnExit()"<<std::endl;
-    // bbtk::Object::PrintObjectListInfo();
-    return true; }
-  void OnInitCmdLine(wxCmdLineParser& parser);
-  bool OnCmdLineParsed(wxCmdLineParser& parser);
-  void Run(bbtk::Interpreter*);
+  WxProcessCmdLine() {}
+  void Process(wxCmdLineParser& parser);
 
-  bbtk::Interpreter* I;
-  int argc;
+  //  int argc;
   std::vector<std::string> argv;
   bool console;
   bool debug;
@@ -51,40 +45,36 @@ public:
   bool graphical_dialog;
   bool text_dialog;
   bool no_console;
-
+  bool proceed;
   std::map<std::string,std::string> param_map;
   std::vector<std::string> input_file;
   
 };
+//==========================================================================
 
-IMPLEMENT_APP(wxBBIApp);
-
-void wxBBIApp::OnInitCmdLine(wxCmdLineParser& parser)
-{
-  //    std::cout << "OnInitCmdLine"<<std::endl;
-  parser.SetDesc(cmdLineDesc);
-}
-
-bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
+//==========================================================================
+void WxProcessCmdLine::Process(wxCmdLineParser& parser)
 {
-
+  proceed = true;
   if (parser.Found(_T("D"))) 
     {
       bbtk::StaticInitTime::PrintObjectListInfo = true;
     }
   
-  debug = ( parser.Found(_T("d")) );
-
+  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_console = ( parser.Found(_T("N")) );
+  
+  if (quiet) bbtk::MessageManager::SetMessageLevel("max",0);
+  if (debug) bbtk::MessageManager::SetMessageLevel("all",9);
 
   // parse the arguments and consider those which contain a "=" 
   // as set input commands, other as files
-  int argc = parser.GetParamCount();
-  for (int i=0; i<argc; ++i) 
+  int pargc = parser.GetParamCount();
+  for (int i=0; i<pargc; ++i) 
     {
       std::string s = bbtk::wx2std(parser.GetParam(i));
       std::string::size_type pos = s.find_first_of("=");
@@ -93,11 +83,9 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 	  std::string left = s.substr(0,pos);
 	  std::string right = s.substr(pos+1,s.size());
 	  param_map[left]=right;
-	  //	  std::cout << "'"<<left << "' = '"<<right<<"'"<<std::endl;
 	}
       else 
 	{
-	  //	  std::cout << "input file = ["<<s<<"]"<<std::endl;
 	  input_file.push_back(s);
 	}
     }
@@ -108,29 +96,62 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 	      << bbtk::GetVersion() << " - (c) Creatis 2007-2008"
 	      << std::endl;
     parser.Usage();
+    proceed = false;
   }
 
   console = ( parser.Found(_T("c")) || 
 	      ((input_file.size() == 0) && 
 	       (!no_console) &&
 	       (!usage) ) );
+  
+}
+//==========================================================================
+
+
+//==========================================================================
+class wxBBIApp : public wxApp
+{
+public:
+  bool OnInit( );
+  int  OnExit() { 
+    //    std::cout << "wxBBIApp::OnExit()"<<std::endl;
+    // bbtk::Object::PrintObjectListInfo();
+    return true; }
+  void OnInitCmdLine(wxCmdLineParser& parser);
+  bool OnCmdLineParsed(wxCmdLineParser& parser);
 
+  WxProcessCmdLine cmd;
+};
+//==========================================================================
 
 
+//==========================================================================
+void wxBBIApp::OnInitCmdLine(wxCmdLineParser& parser)
+{
+  parser.SetDesc(cmdLineDesc);
+}
+//==========================================================================
+
+//==========================================================================
+bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+  cmd.Process(parser);
+  // if (!cmd.proceed) return false;
   return true;
 }
+//==========================================================================
 
 
 
 
 
 
-// ----------------------------------------------------------------------------
+//==========================================================================
 // The `main program' equivalent, creating the windows and returning the
 // main frame
 bool wxBBIApp::OnInit( )
 {
-  //    std::cout << "OnInit"<<std::endl;
+  //      std::cout << "OnInit"<<std::endl;
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale
@@ -138,32 +159,34 @@ bool wxBBIApp::OnInit( )
 #endif
   
 
-  if (quiet) bbtk::MessageManager::SetMessageLevel("max",0);
-  if (debug) bbtk::MessageManager::SetMessageLevel("all",9);
+  if (cmd.quiet) bbtk::MessageManager::SetMessageLevel("max",0);
+  if (cmd.debug) bbtk::MessageManager::SetMessageLevel("all",9);
   
 
   bbtk::WxGUIConsole *I = new bbtk::WxGUIConsole(0,_T("bbi"),wxSize(800,600));
   SetTopWindow(I);  
-  if (console) I->Show(true);
+  if (cmd.console) I->Show(true);
 
 
-  I->SetInputs(param_map);
+  I->SetInputs(cmd.param_map);
 
-  bool help_on_script = help && (input_file.size() > 0);
-  if (help_on_script) I->SetNoExecMode(true);
-
-  if (graphical_dialog) I->SetDialogMode(bbtk::VirtualExec::GraphicalDialog);
-  if (text_dialog) I->SetDialogMode(bbtk::VirtualExec::TextDialog);
+  bool help_on_script = cmd.help && (cmd.input_file.size() > 0);
+  if (help_on_script) 
+    I->SetNoExecMode(true);
+  if (cmd.graphical_dialog) 
+    I->SetDialogMode(bbtk::VirtualExec::GraphicalDialog);
+  if (cmd.text_dialog) 
+    I->SetDialogMode(bbtk::VirtualExec::TextDialog);
 
   std::vector<std::string>::const_iterator i;
   bool error = false;
 
-  for (i=input_file.begin(); i!=input_file.end(); ++i) 
+  for (i=cmd.input_file.begin(); i!=cmd.input_file.end(); ++i) 
     {
       error = ! I->InterpretFile(*i);
       if (error) break;
     }
-  bool show_on_error = error && ! no_console;
+  bool show_on_error = error && ! cmd.no_console;
   if (show_on_error) I->Show();
 
   I->SetNoExecMode(false);
@@ -171,19 +194,37 @@ bool wxBBIApp::OnInit( )
   if (help_on_script) 
     {
       std::string package; 
-      I->GetInterpreter()->GetExecuter()->GetFactory()->HelpBlackBox("workspace",package,false);
+      I->GetInterpreter()->GetExecuter()->GetFactory()->PrintHelpDescriptor("workspace",package,false);
     }
 
-  if (!(show_on_error || console || 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 || cmd.console || bbtk::Wx::IsSomeWindowAlive() ))
     {
       I->Close();
+      //      std::cout << "I->Close"<<std::endl;
     }
+  else 
+    {
+      //      std::cout << "!I->Close"<<std::endl;
+    }
+	
+  //	std::cout << "EO OnInit"<<std::endl;
+
   return true;
 
 }
+//==========================================================================
 
 
 #if defined(_WIN32) 
+//==========================================================================
+// WINDOWS
+//==========================================================================
+IMPLEMENT_APP(wxBBIApp);
 
 //  How to have a Console and wxWidgets
 //  http://www.wxwidgets.org/wiki/index.php/MSVC_Setup_Guide
@@ -192,10 +233,79 @@ bool wxBBIApp::OnInit( )
 //  you need to use the linker option "/subsystem:console" and the following code:
 int main(int argc, char* argv[])
 {
-	return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
+    return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
 }
 
+#else 
+//==========================================================================
+// OTHER ( Linux... )
+//==========================================================================
+
+IMPLEMENT_APP_NO_MAIN(wxBBIApp);
+
+
+int main(int argc, char* argv[])
+{	
+  wxMessageOutput::Set( new wxMessageOutputBest );
+
+  wxCmdLineParser parser(cmdLineDesc,argc,argv);
+  int val = parser.Parse(false);
+  if (val>0) 
+    {  
+      parser.Usage();
+      return 0;
+    }
+  WxProcessCmdLine cmdline;
+  cmdline.Process(parser);
+
+  if (!cmdline.proceed) return 0;
+
+  if (cmdline.no_console) 
+    {
+      //      std::cout << "main NC"<<std::endl;
+      // Interpreter 
+      bbtk::Interpreter::Pointer I = bbtk::Interpreter::New();
+      I->SetInputs(cmdline.param_map);
+      bool help_on_script = cmdline.help && (cmdline.input_file.size() > 0);
+      if (help_on_script) I->SetNoExecMode(true);
+      if (cmdline.text_dialog) I->SetDialogMode(bbtk::VirtualExec::TextDialog);
+      std::vector<std::string>::const_iterator i;
+      bool error = false;
+      for (i=cmdline.input_file.begin(); 
+	   i!=cmdline.input_file.end(); ++i) 
+	{
+	  error = ! I->InterpretFile(*i);
+	  if (error) break;
+	}
+      if (help_on_script) 
+	{
+	  I->SetNoExecMode(false);
+	  std::string package; 
+	  I->GetExecuter()->GetFactory()->PrintHelpDescriptor("workspace",
+							      package,
+							      false);
+	}
+      if (cmdline.input_file.size()==0)
+	I->CommandLineInterpreter();
+
+      //
+    }
+  else 
+    {
+      wxEntry(argc, argv);
+    }
+
+}
+
+
 #endif // defined(_WIN32) 
+//==========================================================================
+
+
+
+
+
+
 
 
 #else
@@ -205,26 +315,132 @@ int main(int argc, char* argv[])
 
 #include "bbtkInterpreter.h"
 
-int main(int argc, char* argv[])
-{  
+// Processes the command line parsing result
+struct ProcessCmdLine
+{
+  ProcessCmdLine() {}
+  void Process(int argc_, char *argv_[]);
+  bool Found(std::string value);
 
-  if (argc>2) return 0;
+  int  argc;
+  std::vector<std::string> argv;
+  bool console;
+  bool debug;
+  bool quiet;
+  bool help;
+  bool graphical_dialog;
+  bool text_dialog;
+  bool no_console;
+  bool proceed;
+  std::map<std::string,std::string> param_map;
+  std::vector<std::string> input_file;
+  
+};
 
-  std::cout << "BBI (Black Box Interpreter) - bbtk "
-	    << bbtk::GetVersion()<< " - (c) Creatis 2007"
-	    <<std::endl;
+bool ProcessCmdLine::Found(std::string value)
+{
+	bool result=false;
+  	for (int i=1; i<argc; ++i) 
+    	{
+		if (value==argv[i]) 
+	    	{
+			result = true;
+		} 
+	} // for
+	return result;
+}
 
-  bbtk::Interpreter I;
-  if (argc==1) 
+void ProcessCmdLine::Process(int argc_, char *argv_[])
+{
+   argc = argc_;
+   for (int i=0; i<argc; ++i) 
     {
-      I.CommandLineInterpreter();
-    }
-  else 
+	argv.push_back(argv_[i]);
+    } // for
+
+//EED  proceed = true;
+  if (Found("D")) 
     {
-      std::string f(argv[1]);
-      I.InterpretFile(f);
+      bbtk::StaticInitTime::PrintObjectListInfo = true;
     }
-    
+  
+  debug 		= ( Found("d") );  
+  quiet			= ( Found("q") );
+  help			= ( Found("h") );
+  graphical_dialog 	= ( Found("g") );
+  text_dialog 		= ( Found("t") );
+  no_console 		= ( Found("N") );
+  
+  if (quiet) bbtk::MessageManager::SetMessageLevel("max",0);
+  if (debug) bbtk::MessageManager::SetMessageLevel("all",9);
+
+  // parse the arguments and consider those which contain a "=" 
+  // as set input commands, other as files
+//EED  int pargc = parser.GetParamCount();
+  for (int i=1; i<argc; ++i) 
+    {
+      std::string s = argv[i];
+      std::string::size_type pos = s.find_first_of("=");
+      if (std::string::npos != pos) 
+	{
+	  std::string left = s.substr(0,pos);
+	  std::string right = s.substr(pos+1,s.size());
+	  param_map[left]=right;
+	}
+      else 
+	{
+	  input_file.push_back(s);
+	}
+    }// for
+
+  bool usage = (help && (input_file.size()==0));
+  if (usage) {
+    std::cout << "BBI (The Black Box Interpreter) - bbtk "
+	      << bbtk::GetVersion() << " - (c) Creatis 2007-2008"
+	      << std::endl;
+//EED    parser.Usage();
+    proceed = false;
+  }
+
+  console = ( Found("c") || 
+	      ((input_file.size() == 0) && 
+	       (!no_console) &&
+	       (!usage) ) );
+  
+}
+//==========================================================================
+
+
+
+int main(int argc, char* argv[])
+{  
+//EED
+//  if (argc>2) 
+//    {
+//      std::cout << "usage : "<<argv[0]<<" [filename]"<<std::endl;
+//      return 0;
+//    }
+
+  std::cout << "BBI (Black Box Interpreter) - bbtk "
+            << bbtk::GetVersion()<< " - (c) Creatis 2007"
+            << std::endl;
+
+  bbtk::Interpreter::Pointer I = bbtk::Interpreter::New();
+  if (argc==1) 
+  {
+      	I->CommandLineInterpreter();
+  }  else     {
+	 
+	ProcessCmdLine cmd;
+	cmd.Process(argc,argv);
+      	I->SetInputs(cmd.param_map);
+
+      	std::string f(argv[1]);
+      	I->InterpretFile(f);
+  }
+  
+  //  bbtk::Wx::LoopUntilAllWindowsClose(); 
+     
   return 0;
 
 }