X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=8f3c4e80452d361d2f0b6d3d3357184bfd81e029;hb=ca35bb0588533c9eac29b7d3ef8689c97ccfcfe7;hp=e70ca40295ec3f4c36c90a5a01408c2ebed0d9dd;hpb=2b8d8f686974ab38c9ffcf0f88dd533b01b68e84;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx index e70ca40..8f3c4e8 100644 --- a/kernel/src/bbtkWxGUIConsole.cxx +++ b/kernel/src/bbtkWxGUIConsole.cxx @@ -1,20 +1,35 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkWxGUIConsole.cxx,v $ Language: C++ - Date: $Date: 2008/04/23 14:49:28 $ - Version: $Revision: 1.8 $ - - 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: 2009/05/28 08:12:06 $ + Version: $Revision: 1.16 $ +=========================================================================*/ + +/* --------------------------------------------------------------------- + +* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) +* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux +* +* 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. +* ------------------------------------------------------------------------ */ + + +/** * \brief Short description in one line * * Long description which @@ -52,6 +67,7 @@ namespace bbtk ID_Menu_CreatePackage, ID_Menu_CreateBlackBox, ID_Menu_ShowImageGraph, + ID_Menu_ShowHTMLDoc, ID_Menu_CreateIndex, ID_Button_Run }; @@ -83,6 +99,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") ); @@ -151,13 +168,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); - */ - Wx::CreateInvisibleTopWindow(this); + // 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); @@ -181,6 +200,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) @@ -277,7 +330,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); @@ -306,13 +359,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)) @@ -339,7 +414,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 @@ -376,17 +451,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() //================================================================