X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=031ee43a5a1bc55a8d488eff64a6a09c97eed4c0;hb=f5ee1c433d1c86bc0aa11fdaba7aa891cbad9b8a;hp=edaaf6aed2d86151f93574dd3616ccedb95d8ea6;hpb=61352f4baaeca7c15a3f77edfeff344cc6dc4e99;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx index edaaf6a..031ee43 100644 --- a/kernel/src/bbtkWxGUIConsole.cxx +++ b/kernel/src/bbtkWxGUIConsole.cxx @@ -1,20 +1,42 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ */ + + /*========================================================================= - Program: bbtk Module: $RCSfile: bbtkWxGUIConsole.cxx,v $ Language: C++ - Date: $Date: 2008/03/21 11:44:37 $ - Version: $Revision: 1.4 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - -=========================================================================*//** + Date: $Date: 2012/11/16 08:49:01 $ + Version: $Revision: 1.18 $ +=========================================================================*/ + + + + +/** * \brief Short description in one line * * Long description which @@ -52,6 +74,7 @@ namespace bbtk ID_Menu_CreatePackage, ID_Menu_CreateBlackBox, ID_Menu_ShowImageGraph, + ID_Menu_ShowHTMLDoc, ID_Menu_CreateIndex, ID_Button_Run }; @@ -64,9 +87,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 +106,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") ); @@ -150,11 +175,15 @@ namespace bbtk 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); - + // Set the parent window of all bbtk windows as a child of this + // bbtk::Wx::SetTopWindowParent(this); + bbtk::Wx::SetTopWindow(this); + // Top Window Auto Destroys when no more black box window alive + // : this is the default + // bbtk::Wx::SetAutoDestroyTopWindow(true); + // Add the method OnWxSignal as a Wx::Signal observer + bbtkAddWxSignalObserver(WxGUIConsole::OnWxSignal); + // Layout //EED SetSizer(sizer); @@ -178,6 +207,40 @@ namespace bbtk } //================================================================ + //================================================================ + void WxGUIConsole::OnClose(wxCloseEvent& event) + { + bbtkDebugMessage("widget",9,"bbi::OnClose()"<Close(); + } + this->Destroy(); + } + //================================================================ + + //================================================================ + void WxGUIConsole::OnWxSignal() + { + if ((!bbtk::Wx::IsSomeWindowAlive())&&(!IsShown())) + { + bbtkDebugMessage("wx",2," --> bbtk top window destroyed and WxGUIConsole not shown => destructing"<Close(); + } + */ + Close(); + } + } + //================================================================ //================================================================ void WxGUIConsole::WxGUICommandEnter(const std::string& command) @@ -214,7 +277,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 +293,7 @@ namespace bbtk { SetStatusText(_T("The current page is not a bbs file : cannot execute it")); } - - delete I; + } //================================================================ @@ -248,7 +310,7 @@ namespace bbtk { m_mgr.Update(); Refresh(); - wxMessageBox(_T(" bbi\nThe Black Box Toolkit interpreter\n(c) CREATIS-LRMN 2008"), + wxMessageBox(_T(" bbi\nThe Black Box Toolkit interpreter\n(c) CREATIS 2008"), _T("About ..."), wxOK | wxICON_INFORMATION, this); } @@ -275,18 +337,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"); + std::string command("toolsbbtk/appli/GUICreatePackage"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); -printf("EED WxGUIConsole::OnMenuCreatePackage 05 \n"); - delete I; -printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); } //================================================================ @@ -294,11 +349,10 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); //================================================================ void WxGUIConsole::OnMenuCreateBlackBox(wxCommandEvent& WXUNUSED(event)) { - std::string command("toolsbbtk/appli/CreateBlackBox"); + std::string command("toolsbbtk/appli/GUICreateBlackBox"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); - delete I; } //================================================================ @@ -312,7 +366,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 +395,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 +458,28 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n"); } //================================================================ - + //================================================================ + // Overloaded Show method to handle bbtk::Wx::TopWindow auto-destruction + // OBSOLETE !!! + bool WxGUIConsole::Show(bool show) + { + // bbtk::Wx::SetAutoDestroyTopWindow(!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_CLOSE( WxGUIConsole::OnClose) + 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() //================================================================