X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2Fbbi%2Fbbi.cxx;h=89a3daa305de477cb5ad38f819a1875e7758de05;hb=f707cd7054d48f29fa0e6e3b47fb152b0ea324e8;hp=812f115a63f68df3b3d64b2054ca56d4961437f0;hpb=7c1fcdc3a9cf88caea0a9e8669b20149cf3da013;p=bbtk.git

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index 812f115..89a3daa 100644
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 #ifdef _USE_WXWIDGETS_
 
 //==========================================================================
@@ -33,7 +60,7 @@ static const wxCmdLineEntryDesc cmdLineDesc[] =
 // Processes the command line parsing result
 struct WxProcessCmdLine
 {
-  ProcessCmdLine() {}
+  WxProcessCmdLine() {}
   void Process(wxCmdLineParser& parser);
 
   //  int argc;
@@ -64,7 +91,7 @@ void WxProcessCmdLine::Process(wxCmdLineParser& parser)
   debug = ( parser.Found(_T("d")) );  
   quiet = ( parser.Found(_T("q")) );
   help = ( parser.Found(_T("h")) );
-  graphical_dialog = ( parser.Found(_T("g")) );
+  graphical_dialog = ( parser.Found(_T("wxcommandlineg")) );
   text_dialog = ( parser.Found(_T("t")) );
   no_console = ( parser.Found(_T("N")) );
   
@@ -151,6 +178,9 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 // main frame
 bool wxBBIApp::OnInit( )
 {
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED wxBBIApp::OnInit\n"); fclose(ff);
+
   //      std::cout << "OnInit"<<std::endl;
   wxApp::OnInit();
 #ifdef __WXGTK__
@@ -163,6 +193,11 @@ bool wxBBIApp::OnInit( )
   if (cmd.debug) bbtk::MessageManager::SetMessageLevel("all",9);
   
 
+//Borrame
+//printf ("EED bbi wxBBIApp::OnInit .....................\n");
+//cmd.input_file.push_back("/home/davila/Borrame/testwt.bbs");
+
+
   bbtk::WxGUIConsole *I = new bbtk::WxGUIConsole(0,_T("bbi"),wxSize(800,600));
   SetTopWindow(I);  
   if (cmd.console) I->Show(true);
@@ -171,12 +206,9 @@ bool wxBBIApp::OnInit( )
   I->SetInputs(cmd.param_map);
 
   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);
+  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;
@@ -233,6 +265,10 @@ IMPLEMENT_APP(wxBBIApp);
 //  you need to use the linker option "/subsystem:console" and the following code:
 int main(int argc, char* argv[])
 {
+
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED main C\n"); fclose(ff);
+
     return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
 }
 
@@ -246,6 +282,10 @@ IMPLEMENT_APP_NO_MAIN(wxBBIApp);
 
 int main(int argc, char* argv[])
 {	
+
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED main A\n"); fclose(ff);
+
   wxMessageOutput::Set( new wxMessageOutputBest );
 
   wxCmdLineParser parser(cmdLineDesc,argc,argv);
@@ -255,7 +295,7 @@ int main(int argc, char* argv[])
       parser.Usage();
       return 0;
     }
-  ProcessCmdLine cmdline;
+  WxProcessCmdLine cmdline;
   cmdline.Process(parser);
 
   if (!cmdline.proceed) return 0;
@@ -424,6 +464,8 @@ int main(int argc, char* argv[])
   std::cout << "BBI (Black Box Interpreter) - bbtk "
             << bbtk::GetVersion()<< " - (c) Creatis 2007"
             << std::endl;
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED main B\n"); fclose(ff);
 
   bbtk::Interpreter::Pointer I = bbtk::Interpreter::New();
   if (argc==1)