X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=53cbb2fdc4d40f0a7d0c7b88971600c71aae6309;hb=d8041d1ef54a73acc2306557435f6b04edf60daf;hp=164e244016272a360f93b2c0252cee3f2c5c3e2a;hpb=f0d396e8c3585edca83571ed0eeacef1b72828f1;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx index 164e244..53cbb2f 100644 --- a/kernel/src/bbtkWxGUIConsole.cxx +++ b/kernel/src/bbtkWxGUIConsole.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIConsole.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 11:04:57 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -52,6 +52,7 @@ namespace bbtk ID_Menu_CreatePackage, ID_Menu_CreateBlackBox, ID_Menu_ShowImageGraph, + ID_Menu_ShowHTMLDoc, ID_Menu_CreateIndex, ID_Button_Run }; @@ -64,9 +65,10 @@ namespace bbtk // m_mgr = new wxAuiManager(this); m_mgr.SetManagedWindow(this); - mInterpreter = new bbtk::Interpreter(); + mInterpreter = bbtk::Interpreter::New(); mInterpreter->SetUser(this); mInterpreter->SetCommandLine(true); + mInterpreter->SetThrow(false); //============== // Menu wxInitAllImageHandlers(); @@ -82,6 +84,7 @@ namespace bbtk menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") ); menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &blackbox") ); menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last image graph") ); + menuTools->Append( ID_Menu_ShowHTMLDoc, _T("Show &HTML documentation") ); menuTools->Append( ID_Menu_CreateIndex, _T("&Generate index") ); @@ -131,11 +134,11 @@ namespace bbtk wxSize(200,0)); // mWxGUIHtmlBrowser->SetSize(wxSize(800,1000)); - helpsizer->Add (mWxGUIHtmlBrowser,1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM ); + helpsizer->Add (mWxGUIHtmlBrowser,1, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5 ); // helpsizer->Add ( new wxButton(mwxPageHelp,-1,"perro"), 0, wxEXPAND ); wxBitmap bmp_run(cc_run_xpm); mwxButtonRun = new wxBitmapButton( mwxPageHelp,ID_Button_Run,bmp_run);//_T("Run") ); - helpsizer->Add( mwxButtonRun ); + helpsizer->Add( mwxButtonRun, 0, wxALL, 5 ); //============== @@ -146,15 +149,15 @@ namespace bbtk mWxGUICommand->SetFocus(); - cmdsizer->Add (mWxGUIOutputMessages, 1, wxALL | wxGROW, 10); - cmdsizer->Add (mWxGUICommand, 1, wxALL | wxGROW, 10); + cmdsizer->Add (mWxGUIOutputMessages, 1, wxALL | wxGROW, 5); + cmdsizer->Add (mWxGUICommand, 0, wxALL | wxGROW, 5); - // Creates and sets the parent window of all bbtk windows - wxWindow* top = new wxPanel(this,-1);//,_T("top")); - top->Hide(); - Wx::SetTopWindow(top); - + // Creates the parent window of all bbtk windows as a child of this + Wx::CreateTopWindow(this,true); + // Add the method OnWxSignal as a Wx::Signal observer + bbtkAddWxSignalObserver(WxGUIConsole::OnWxSignal); + // Layout //EED SetSizer(sizer); @@ -178,6 +181,16 @@ namespace bbtk } //================================================================ + //================================================================ + void WxGUIConsole::OnWxSignal() + { + if ((!Wx::TopWindowExists())&&(!IsShown())) + { + bbtkDebugMessage("wx",2," --> bbtk top window destroyed and WxGUIConsole not shown => destructing"<Print(s,wxRED); if ( mInterpreter->InterpretLine( command ) == - Interpreter::QUIT ) + Interpreter::Interpreter_QUIT ) { Close(true); } @@ -199,7 +212,7 @@ namespace bbtk bool WxGUIConsole::InterpretFile( const std::string& filename) { if ( mInterpreter->InterpretFile(filename) == - Interpreter::ERROR ) + Interpreter::Interpreter_ERROR ) { return false; } @@ -214,7 +227,7 @@ namespace bbtk std::string filename = mWxGUIHtmlBrowser->GetCurrentPage();//wx2std(temp); size_t s = filename.length(); - Interpreter* I = new Interpreter; + Interpreter::Pointer I = Interpreter::New(); if ((s>3) && (filename[s-1]=='s') && (filename[s-2]=='b') @@ -230,8 +243,7 @@ namespace bbtk { SetStatusText(_T("The current page is not a bbs file : cannot execute it")); } - - delete I; + } //================================================================ @@ -275,18 +287,11 @@ namespace bbtk //================================================================ void WxGUIConsole::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event)) { -printf("EED WxGUIConsole::OnMenuCreatePackage 01 \n"); std::string command("toolsbbtk/appli/CreatePackage"); -printf("EED WxGUIConsole::OnMenuCreatePackage 02 \n"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); -printf("EED WxGUIConsole::OnMenuCreatePackage 05 \n"); - delete I; -printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); } //================================================================ @@ -296,9 +301,8 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); { std::string command("toolsbbtk/appli/CreateBlackBox"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); - delete I; } //================================================================ @@ -312,7 +316,28 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); #else std::string strappli="gnome-open "; #endif - std::string strcommand = strappli +default_temp_dir+"/temp_dir/workspace_workspacePrototype.png"; + std::string strcommand0 = "cd \"" + default_temp_dir+"/temp_dir/" +"\""; + std::string strcommand1 = strappli + "workspace_workspacePrototype.png"; + std::string strcommand = strcommand0 + " && " + strcommand1; + std::cout << "system: " << strcommand << std::endl; + system ( strcommand.c_str() ); + + } + //================================================================ + + //================================================================ + void WxGUIConsole::OnMenuShowHTMLDoc(wxCommandEvent& WXUNUSED(event)) + { + std::string doc_path = ConfigurationFile::GetInstance().Get_doc_path(); + +#if defined(WIN32) + std::string strappli="start "; +#else + std::string strappli="gnome-open "; +#endif + std::string strcommand0 = "cd \"" + doc_path+"\""; + std::string strcommand1 = strappli + "index.html"; + std::string strcommand = strcommand0 + " && " + strcommand1; std::cout << "system: " << strcommand << std::endl; system ( strcommand.c_str() ); @@ -320,24 +345,48 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); //================================================================ + //================================================================ void WxGUIConsole::OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event)) { +/* std::string doc_path = ConfigurationFile::GetInstance().Get_doc_path(); std::string filepath = doc_path+"/bbdoc/make-index.bbs"; Interpreter* I = new Interpreter; - -//EED std::cout << "bbi: include "<InterpretFile( filepath ); - I->InterpretLine( "exec freeze"); I->InterpretLine( "include *"); + I->InterpretLine( "help packages"); I->InterpretLine( "index "+doc_path+"/bbdoc/index-alpha.html Initials"); I->InterpretLine( "index "+doc_path+"/bbdoc/index-package.html Packages"); I->InterpretLine( "index "+doc_path+"/bbdoc/index-category.html Categories"); - I->InterpretLine( "index "+doc_path+"/bbdoc/index-adaptors.html Adaptors"); - + I->InterpretLine( "index "+doc_path+"/bbdoc/index-adaptors.html Adaptors"); delete I; +*/ + + std::string bin_path = ConfigurationFile::GetInstance().Get_bin_path(); + std::string doc_path = ConfigurationFile::GetInstance().Get_doc_path(); + std::string bbdoc_path = doc_path+"/bbdoc"; + std::string make_index_path = "\"" + bbdoc_path+"/make-index.bbs\""; + + std::string strcommand0 = "cd "+bbdoc_path+" && mkdir tmp && cd tmp"; + + std::string strcommand1 = "cd "+bbdoc_path+"/tmp"; + std::string strcommand2 = "\""+bin_path+"/bbi\" -n "+make_index_path; +#ifdef WIN32 + std::string strcommand3 = "move index*.html ../."; +#else + std::string strcommand3 = "mv index*.html ../."; +#endif + + std::string strcommand = strcommand1 +" && "+ + strcommand2 +" && "+ + strcommand3; + + std::cout << "system: " << strcommand0 << std::endl; + std::cout << "system: " << strcommand << std::endl; + + system ( strcommand0.c_str() ); + system ( strcommand.c_str() ); } //================================================================ @@ -359,17 +408,26 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); } //================================================================ - + //================================================================ + // Overloaded Show method to handle bbtk::Wx::TopWindow auto-destruction + bool WxGUIConsole::Show(bool show) + { + Wx::AutoDestroyTopWindow(!show); + return wxFrame::Show(show); + } + //================================================================ + //================================================================ BEGIN_EVENT_TABLE(WxGUIConsole, wxFrame) - EVT_MENU(ID_Menu_Quit, WxGUIConsole::OnMenuQuit) - EVT_MENU(ID_Menu_About, WxGUIConsole::OnMenuAbout) - EVT_MENU(ID_Menu_EditConfig, WxGUIConsole::OnMenuEditConfig) - EVT_MENU(ID_Menu_CreatePackage, WxGUIConsole::OnMenuCreatePackage) - EVT_MENU(ID_Menu_CreateBlackBox, WxGUIConsole::OnMenuCreateBlackBox) - EVT_MENU(ID_Menu_ShowImageGraph, WxGUIConsole::OnMenuShowImageGraph) - EVT_MENU(ID_Menu_CreateIndex, WxGUIConsole::OnMenuCreateIndex) - EVT_BUTTON(ID_Button_Run, WxGUIConsole::OnButtonRun ) + EVT_MENU(ID_Menu_Quit , WxGUIConsole::OnMenuQuit) + EVT_MENU(ID_Menu_About , WxGUIConsole::OnMenuAbout) + EVT_MENU(ID_Menu_EditConfig , WxGUIConsole::OnMenuEditConfig) + EVT_MENU(ID_Menu_CreatePackage , WxGUIConsole::OnMenuCreatePackage) + EVT_MENU(ID_Menu_CreateBlackBox , WxGUIConsole::OnMenuCreateBlackBox) + EVT_MENU(ID_Menu_ShowImageGraph , WxGUIConsole::OnMenuShowImageGraph) + EVT_MENU(ID_Menu_ShowHTMLDoc , WxGUIConsole::OnMenuShowHTMLDoc) + EVT_MENU(ID_Menu_CreateIndex , WxGUIConsole::OnMenuCreateIndex) + EVT_BUTTON(ID_Button_Run , WxGUIConsole::OnButtonRun ) END_EVENT_TABLE() //================================================================