X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=031ee43a5a1bc55a8d488eff64a6a09c97eed4c0;hb=84454af9be8cecfbf41ca7c0198c65efe60f9b48;hp=a4d4299144b6067fbe87626fe27f4bcb86bfc276;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx index a4d4299..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/04/18 12:59:16 $ - Version: $Revision: 1.6 $ - - 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 }; @@ -67,6 +90,7 @@ namespace bbtk 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) @@ -247,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); } @@ -274,7 +337,7 @@ namespace bbtk //================================================================ void WxGUIConsole::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event)) { - std::string command("toolsbbtk/appli/CreatePackage"); + std::string command("toolsbbtk/appli/GUICreatePackage"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); @@ -303,13 +366,35 @@ namespace bbtk #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() ); + + } + //================================================================ + + //================================================================ void WxGUIConsole::OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event)) @@ -336,7 +421,7 @@ namespace bbtk 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; + std::string strcommand2 = "\""+bin_path+"/bbi\" -N "+make_index_path; #ifdef WIN32 std::string strcommand3 = "move index*.html ../."; #else @@ -373,17 +458,28 @@ namespace bbtk } //================================================================ - + //================================================================ + // 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() //================================================================