X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=245e1f2a927ebfcb3258f1c350b2090e3b66b68f;hb=2d2fc4c6349d5040a9f13a240f079e7a1c6687dd;hp=8a6ebfb17d9db41fe99340f809f351a58763f7af;hpb=a09174b82cb36ffd30bdbaed12c6ebd936a0e8f7;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index 8a6ebfb..245e1f2 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -1,20 +1,35 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2008/07/23 11:46:11 $ - Version: $Revision: 1.14 $ - - 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: 2008/10/21 14:38:31 $ + Version: $Revision: 1.31 $ +=========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 @@ -37,7 +52,9 @@ #include "bbtkWxBlackBox.h" #include "bbtkConfigurationFile.h" #include "bbtkWxStreamRedirector.h" - +#include "bbtkUtilities.h" + +#include //#include "icons/cc_run.xpm" @@ -52,7 +69,10 @@ namespace bbtk ID_Menu_CreatePackage, ID_Menu_CreateBlackBox, ID_Menu_ShowImageGraph, - ID_Menu_CreateIndex, + ID_Menu_RegeneratePackageDoc, + ID_Menu_RegenerateBoxesLists, + ID_Menu_RegenerateAll, + ID_Menu_PlugPackage, ID_Menu_Windows_Files, ID_Menu_Windows_Help, ID_Menu_Windows_Messages, @@ -64,32 +84,39 @@ namespace bbtk //================================================================ - WxGUIScriptingInterface::WxGUIScriptingInterface( wxWindow *parent, wxString title, wxSize size) - : wxFrame((wxFrame *)parent, -1, title, wxDefaultPosition, size) + WxGUIScriptingInterface::WxGUIScriptingInterface( wxWindow *parent ) + : wxFrame((wxFrame *)parent, -1, _T("bbStudio"), + wxDefaultPosition, wxSize(1200,800) ) { -// m_mgr = new wxAuiManager(this); - m_mgr.SetManagedWindow(this); - - mInterpreter = bbtk::Interpreter::New(); + // m_mgr = new wxAuiManager(this); + m_mgr.SetManagedWindow(this); + + mInterpreter = bbtk::Interpreter::New(); mInterpreter->SetUser(this); mInterpreter->SetCommandLine(true); mInterpreter->SetThrow(true); + //============== // Menu wxInitAllImageHandlers(); wxMenu *menuFile = new wxMenu; + menuFile->Append( ID_Menu_EditConfig, _T("Open bbtk &Config file") ); menuFile->Append( ID_Menu_Quit, _T("&Quit") ); wxMenu *menuAbout = new wxMenu; menuAbout->Append( ID_Menu_About, _T("&About...") ); wxMenu *menuTools = new wxMenu; - menuTools->Append( ID_Menu_EditConfig, _T("&Edit bbtk config") ); 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_CreateIndex, _T("&Generate index") ); + menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &black box") ); + menuTools->Append( ID_Menu_PlugPackage, _T("&Plug package") ); + menuTools->AppendSeparator(); + menuTools->Append( ID_Menu_RegeneratePackageDoc,_T("Regenerate package &doc") ); + menuTools->Append( ID_Menu_RegenerateBoxesLists,_T("Regenerate boxes &lists") ); + menuTools->Append( ID_Menu_RegenerateAll,_T("Regenerate &all") ); + menuTools->AppendSeparator(); + menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last graph") ); wxMenu *menuWindows = new wxMenu; menuWindows->AppendCheckItem(ID_Menu_Windows_Files, @@ -101,10 +128,10 @@ namespace bbtk menuWindows->AppendCheckItem(ID_Menu_Windows_Command, _T("Show 'command' panel") )->Check(); menuWindows->AppendSeparator(); - menuWindows->Append( ID_Menu_Windows_PackageBrowser, _T("Show Package &Browser") ); + menuWindows->Append( ID_Menu_Windows_PackageBrowser, _T("Start Package &Browser") ); - menuWindows->AppendSeparator(); - menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration")); + // menuWindows->AppendSeparator(); + // menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration")); wxMenu *menuOptions = new wxMenu; mwxMenuItemReset = menuOptions->AppendCheckItem(-1, @@ -120,21 +147,18 @@ namespace bbtk SetMenuBar( menuBar ); + //=== + // Status bar CreateStatusBar(); SetStatusText( _T("Welcome to bbStudio !") ); - // + //=== + // Panes (Files, Messages, Help, Command) mWxGUITextEditor = new WxGUITextEditor(this,this); mWxGUITextEditor->SetFileNameFilter("*.bbs"); - mWxGUIHtmlBrowser = new WxGUIHtmlBrowser(this,wxSize(200,0),this); - + mWxGUIHtmlBrowser = new WxGUIHtmlBrowser(this,wxSize(200,0),this); - /* - wxBitmap bmp_run(cc_run_xpm); - mwxButtonRun = new wxBitmapButton( this, ID_Button_Run,bmp_run);//_T("Run") ); - */ - mWxGUIOutputMessages = new WxGUIOutputMessages(this); mWxGUICommand = new WxGUICommand(this,this); @@ -142,6 +166,7 @@ namespace bbtk mWxGUICommand->SetFocus(); +#if NOTEBOOK mwxNotebook = new wxAuiNotebook(this, -1, @@ -174,8 +199,8 @@ namespace bbtk .Center() // .MinSize(wxSize(100,100)) ); +#else - /* // m_mgr.AddPane(mWxGUITextEditor, wxAuiPaneInfo().Name(wxT("editor_content")) @@ -192,7 +217,8 @@ namespace bbtk .MinimizeButton(true) .MaximizeButton(true) .Right() - .MinSize(wxSize(200,100)) + .Layer(2) + .MinSize(wxSize(400,100)) ); m_mgr.AddPane(mWxGUIOutputMessages, @@ -209,33 +235,43 @@ namespace bbtk .MinimizeButton(true) .MaximizeButton(true) .Bottom() - .Position(1) + .Layer(1) .MinSize(wxSize(100,100)) ); - */ - // m_mgr.AddPane(mwxButtonRun, - // wxAuiPaneInfo().Name(wxT("button_run_content"))); +#endif - // Creates the parent window of all bbtk windows as a child of this - Wx::CreateTopWindow(this); + // parent window of all bbtk windows will be a child of this + Wx::SetTopWindowParent(this); // Add the method OnWxSignal as a Wx::Signal observer //bbtkAddWxSignalObserver(WxGUIPackageBrowser2Window::OnWxSignal); -//.PaneBorder(false)); - m_mgr.Update(); + //.PaneBorder(false)); + // Load the interface appearance saved on last closing + LoadPerspective(); + + // Done in LoadPerspective + // m_mgr.Update(); SetAutoLayout(true); Layout(); - mwxNotebook->SetSelection(1); + // mwxNotebook->SetSelection(1); mWxGUIHtmlBrowser->GoHome(); // Refresh(); -// m_mgr.Update(); + m_mgr.Update(); + // LoadPerspective(); + + + wxTipWindow* tip = new wxTipWindow(this, + _T("\n Welcome to bbStudio !\n\n To run a demo or example:\n 1. click on the 'Demos' or 'Examples' link\n 2. select a demo or example\n 3. click on the '[source]' link : the source file is loaded in bbStudio\n 4. click on the 'Run' button (the arrow at the bottom right of the source file) \n"),1000); + tip->CenterOnParent(); + tip->Show(); } //================================================================ //================================================================ WxGUIScriptingInterface::~WxGUIScriptingInterface() { + SavePerspective(); m_mgr.UnInit(); } //================================================================ @@ -254,7 +290,7 @@ namespace bbtk } \ catch (InterpreterError e) \ { \ - std::cerr << "* IERROR : "<IncludeAll(); - mwxNotebook->AddPage(browser,_T("Package Browser"),true); + wxBusyCursor wait; + WxGUIPackageBrowser2Window *helpbrowser = new + WxGUIPackageBrowser2Window(this,_T("Package Browser"), wxSize(600,600) ); + helpbrowser->Show(); + + /* + wxBusyCursor wait; + WxGUIPackageBrowser2 *browser = new WxGUIPackageBrowser2(this); + browser->IncludeAll(); + */ +#if NOTEBOOK + // mwxNotebook->AddPage(browser,_T("Package Browser"),true); +#else + /* + m_mgr.AddPane(browser, + wxAuiPaneInfo().Name(wxT("package_brower")) + .Caption(wxT("Package browser")) + .MinimizeButton(true) + .MaximizeButton(true) + .Bottom() + .Position(1) + .MinSize(wxSize(100,100)) + ); + */ +#endif } //================================================================ @@ -364,12 +414,18 @@ namespace bbtk //================================================================ void WxGUIScriptingInterface::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event)) { - +/* std::string command("toolsbbtk/appli/GUICreatePackage"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); +*/ + std::string command("reset"); + mWxGUICommand->SendCommand(command); + command = "include toolsbbtk/appli/GUICreatePackage"; + bbtkMessage("Debug",1,"Executing : '"<SendCommand(command); } //================================================================ @@ -378,11 +434,18 @@ namespace bbtk //================================================================ void WxGUIScriptingInterface::OnMenuCreateBlackBox(wxCommandEvent& WXUNUSED(event)) { + /* std::string command("toolsbbtk/appli/GUICreateBlackBox"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); +*/ + std::string command("reset"); + mWxGUICommand->SendCommand(command); + command = "include toolsbbtk/appli/GUICreateBlackBox"; + bbtkMessage("Debug",1,"Executing : '"<SendCommand(command); } //================================================================ @@ -403,25 +466,131 @@ namespace bbtk } //================================================================ + void WxGUIScriptingInterface::DoRegeneratePackageDoc( const std::string& pack ) + { + std::string command; +#if defined(WIN32) + command = "\""; +#endif + command += ConfigurationFile::GetInstance().Get_bin_path(); + command += ConfigurationFile::GetInstance().Get_file_separator(); + command += "bbRegeneratePackageDoc"; +#if defined(WIN32) + command += "\""; +#endif + command += " " + pack + " -q"; + bbtkMessage("debug",1,"Executing system command '"<InterpretLine( "exec freeze"); - I->InterpretLine( "include *"); - 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"); - + void WxGUIScriptingInterface::DoRegenerateBoxesLists() + { + std::string command; +#if defined(WIN32) + command = "\""; +#endif + command += ConfigurationFile::GetInstance().Get_bin_path(); + command += ConfigurationFile::GetInstance().Get_file_separator(); + command += "bbRegenerateBoxesLists"; +#if defined(WIN32) + command += "\""; +#endif + command += " -q"; + bbtkMessage("debug",1,"Executing system command '"<ShowModal()==wxID_OK) + { + std::string path = wx2std (FD->GetPath()) ; + std::string fname = path + "/bbtkPackage"; + if ( ! Utilities::FileExists( fname ) ) + { + wxString err(_T("The directory does not contain a 'bbtkPackage' file")); + wxMessageBox(err,_T("Plug package"),wxOK | wxICON_ERROR); + return; + } + + std::ifstream f; + f.open(fname.c_str()); + std::string pname; + f >> pname; + f.close(); + + + bbtk::ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path ); + + DoRegeneratePackageDoc(pname); + DoRegenerateBoxesLists(); + + } + } + //================================================================ //================================================================ void WxGUIScriptingInterface::InterpreterUserViewHtmlPage(const std::string& page) @@ -450,7 +619,9 @@ namespace bbtk && (target[s-4]=='.')) { mWxGUITextEditor->Open(target); +#if NOTEBOOK mwxNotebook->SetSelection(0); +#endif mWxGUITextEditor->SetFocus(); return false; } @@ -503,17 +674,75 @@ namespace bbtk //================================================================ void WxGUIScriptingInterface::OnMenuWindowsSave( wxCommandEvent& WXUNUSED(event)) { - // TO DO : Save it into ConfigurationFile - // m_mgr.SavePerspective(); + SavePerspective(); } //================================================================ + //================================================================ + void WxGUIScriptingInterface::SavePerspective() + { + // std::cout << "Saving configuration..."<> conf; + + // int x,y; + // f >> x >> y ; + + int w,h; + f >> w >> h ; + + f.close(); + + // std::cout << conf << std::endl; + + // Move(x,y); + SetSize(w,h); + m_mgr.LoadPerspective(std2wx(conf)); + } + else + { + m_mgr.Update(); + } + } + //================================================================ //================================================================ void WxGUIScriptingInterface::OnPaneClose(wxAuiManagerEvent& evt) { std::cout << "Closing panel '"<name<<"'"<