X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=895410e940cf630a76c004f7f1a98f049650fd73;hb=9ebbefccfab8978b357669af56a08d661386df9a;hp=136986a640ac2fd3068c3d85fe13a0851115974d;hpb=6bfa05367895a6a7cdb78e708a080818c314e906;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index 136986a..895410e 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2008/03/25 15:47:54 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/09/10 07:25:23 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -37,9 +37,10 @@ #include "bbtkWxBlackBox.h" #include "bbtkConfigurationFile.h" #include "bbtkWxStreamRedirector.h" - +#include "bbtkUtilities.h" + -#include "icons/cc_run.xpm" +//#include "icons/cc_run.xpm" namespace bbtk { @@ -57,7 +58,8 @@ namespace bbtk ID_Menu_Windows_Help, ID_Menu_Windows_Messages, ID_Menu_Windows_Command, - ID_Menu_Windows_Save + ID_Menu_Windows_Save, + ID_Menu_Windows_PackageBrowser // ID_Button_Run }; @@ -66,13 +68,14 @@ namespace bbtk WxGUIScriptingInterface::WxGUIScriptingInterface( wxWindow *parent, wxString title, wxSize size) : wxFrame((wxFrame *)parent, -1, title, wxDefaultPosition, size) { -// m_mgr = new wxAuiManager(this); - m_mgr.SetManagedWindow(this); - - mInterpreter = new bbtk::Interpreter(); + // m_mgr = new wxAuiManager(this); + m_mgr.SetManagedWindow(this); + + mInterpreter = bbtk::Interpreter::New(); mInterpreter->SetUser(this); mInterpreter->SetCommandLine(true); mInterpreter->SetThrow(true); + //============== // Menu wxInitAllImageHandlers(); @@ -86,10 +89,10 @@ namespace bbtk 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_CreateBlackBox, _T("Create &black box") ); menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last image graph") ); menuTools->Append( ID_Menu_CreateIndex, _T("&Generate index") ); - + wxMenu *menuWindows = new wxMenu; menuWindows->AppendCheckItem(ID_Menu_Windows_Files, _T("Show 'files' panel") )->Check(); @@ -99,9 +102,11 @@ namespace bbtk _T("Show 'messages' panel") )->Check(); menuWindows->AppendCheckItem(ID_Menu_Windows_Command, _T("Show 'command' panel") )->Check(); - menuWindows->AppendSeparator(); - menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration")); + menuWindows->Append( ID_Menu_Windows_PackageBrowser, _T("Launch Package &Browser") ); + + // menuWindows->AppendSeparator(); + // menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration")); wxMenu *menuOptions = new wxMenu; mwxMenuItemReset = menuOptions->AppendCheckItem(-1, @@ -118,30 +123,55 @@ namespace bbtk SetMenuBar( menuBar ); CreateStatusBar(); - SetStatusText( _T("Welcome to bbi !") ); + SetStatusText( _T("Welcome to bbStudio !") ); // mWxGUITextEditor = new WxGUITextEditor(this,this); mWxGUITextEditor->SetFileNameFilter("*.bbs"); - + 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); mWxGUICommand->SetFocus(); - // Creates and sets the parent window of all bbtk windows - wxWindow* top = new wxPanel(this,-1);//,_T("top")); - top->Hide(); - Wx::SetTopWindow(top); - + +#if NOTEBOOK + + mwxNotebook = new wxAuiNotebook(this, + -1, + wxPoint(0, 0), + wxSize(500,500), + wxAUI_NB_TAB_SPLIT + | wxAUI_NB_TAB_MOVE + | wxAUI_NB_TAB_EXTERNAL_MOVE + //| wxAUI_NB_WINDOWLIST_BUTTON + //|wxAUI_NB_SCROLL_BUTTONS + // | wxAUI_NB_CLOSE_BUTTON + //| wxAUI_NB_CLOSE_ON_ACTIVE_TAB + //| wxAUI_NB_CLOSE_ON_ALL_TABS + | wxNO_BORDER); + + + mwxNotebook->AddPage(mWxGUITextEditor,_T("Files"),true); + mwxNotebook->AddPage(mWxGUIHtmlBrowser,_T("Help"),true); + + mwxNotebook->AddPage(mWxGUIOutputMessages,_T("Messages"),true); + + mwxNotebook->AddPage(mWxGUICommand,_T("Command"),true); + + + m_mgr.AddPane(mwxNotebook, + wxAuiPaneInfo().Name(wxT("nb")) + .CaptionVisible(false) + .MinimizeButton(false) + .MaximizeButton(false) + .Center() + // .MinSize(wxSize(100,100)) + ); +#else // m_mgr.AddPane(mWxGUITextEditor, @@ -149,17 +179,19 @@ namespace bbtk .Caption(wxT("Files")) .MinimizeButton(true) .MaximizeButton(true) - .Center() + .Left() .MinSize(wxSize(100,100)) - ); + ); + m_mgr.AddPane(mWxGUIHtmlBrowser, wxAuiPaneInfo().Name(wxT("browser_content")) .Caption(wxT("Help")) .MinimizeButton(true) .MaximizeButton(true) .Right() - .MinSize(wxSize(100,100)) + .MinSize(wxSize(200,100)) ); + m_mgr.AddPane(mWxGUIOutputMessages, wxAuiPaneInfo().Name(wxT("messages_content")) .Caption(wxT("Messages")) @@ -177,23 +209,33 @@ namespace bbtk .Position(1) .MinSize(wxSize(100,100)) ); - // m_mgr.AddPane(mwxButtonRun, - // wxAuiPaneInfo().Name(wxT("button_run_content"))); +#endif + // 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(); + LoadPerspective(); + + // m_mgr.Update(); SetAutoLayout(true); Layout(); + // mwxNotebook->SetSelection(1); + mWxGUIHtmlBrowser->GoHome(); // Refresh(); // m_mgr.Update(); + // LoadPerspective(); + } //================================================================ //================================================================ WxGUIScriptingInterface::~WxGUIScriptingInterface() { + SavePerspective(); m_mgr.UnInit(); } //================================================================ @@ -206,6 +248,10 @@ namespace bbtk //================================================================ #define CATCH_MACRO \ + catch (QuitException e) \ + { \ + std::cout << "* quit exception caught"<GetCurrentPage()->GetText(); try { + // std::cout << "RUN"<IsChecked()) WxGUICommandEnter("reset"); mInterpreter->InterpretBuffer(buf); + // std::cout << "EO RUN"<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 + } + //================================================================ + + //================================================================ void WxGUIScriptingInterface::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event)) { -printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 01 \n"); - std::string command("toolsbbtk/appli/CreatePackage"); -printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 02 \n"); + std::string command("toolsbbtk/appli/GUICreatePackage"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); -printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 05 \n"); - delete I; -printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); + } //================================================================ @@ -323,11 +399,11 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); //================================================================ void WxGUIScriptingInterface::OnMenuCreateBlackBox(wxCommandEvent& WXUNUSED(event)) { - std::string command("toolsbbtk/appli/CreateBlackBox"); + std::string command("toolsbbtk/appli/GUICreateBlackBox"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); - delete I; } //================================================================ @@ -342,7 +418,7 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); std::string strappli="gnome-open "; #endif std::string strcommand = strappli +default_temp_dir+"/temp_dir/workspace_workspacePrototype.png"; - std::cout << "system: " << strcommand << std::endl; + // std::cout << "system: " << strcommand << std::endl; system ( strcommand.c_str() ); } @@ -354,10 +430,8 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); { 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 ); + Interpreter::Pointer I = Interpreter::New(); I->InterpretLine( "exec freeze"); I->InterpretLine( "include *"); @@ -366,7 +440,6 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); I->InterpretLine( "index "+doc_path+"/bbdoc/index-category.html Categories"); I->InterpretLine( "index "+doc_path+"/bbdoc/index-adaptors.html Adaptors"); - delete I; } //================================================================ @@ -391,7 +464,6 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); //================================================================ bool WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked(const std::string& target) { - std::cout << "OnLink"<3) && (target[s-1]=='s') && (target[s-2]=='b') @@ -399,6 +471,10 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); && (target[s-4]=='.')) { mWxGUITextEditor->Open(target); +#if NOTEBOOK + mwxNotebook->SetSelection(0); +#endif + mWxGUITextEditor->SetFocus(); return false; } return true; @@ -450,11 +526,60 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); //================================================================ 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 w,h; + + f >> w >> h ; + + f.close(); + + // std::cout << conf << std::endl; + + SetSize(w,h); + m_mgr.LoadPerspective(std2wx(conf)); + } + else + { + m_mgr.Update(); + } + } + //================================================================ //================================================================ void WxGUIScriptingInterface::OnPaneClose(wxAuiManagerEvent& evt) @@ -478,6 +603,8 @@ printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n"); EVT_MENU(ID_Menu_Windows_Help, WxGUIScriptingInterface::OnMenuWindowsHelp) EVT_MENU(ID_Menu_Windows_Messages, WxGUIScriptingInterface::OnMenuWindowsMessages) EVT_MENU(ID_Menu_Windows_Command, WxGUIScriptingInterface::OnMenuWindowsCommand) + EVT_MENU(ID_Menu_Windows_Save, WxGUIScriptingInterface::OnMenuWindowsSave) + EVT_MENU(ID_Menu_Windows_PackageBrowser, WxGUIScriptingInterface::OnMenuWindowsPackageBrowser) EVT_AUI_PANE_CLOSE(WxGUIScriptingInterface::OnPaneClose) // EVT_BUTTON(ID_Button_Run, WxGUIScriptingInterface::OnButtonRun ) END_EVENT_TABLE()