X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=621fa5d31fedbc03833a382c5160282fde0f3b01;hb=1688b52778caa9985ecea38aad38341817e0401a;hp=966c1f70486f924d6c5f3eb88e6b00215d0f4322;hpb=f3d05516965aece323133928f72d85e38c2b0b71;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index 966c1f7..621fa5d 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2008/12/15 09:04:47 $ - Version: $Revision: 1.32 $ + Date: $Date: 2010/04/28 22:19:59 $ + Version: $Revision: 1.44 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -55,6 +55,8 @@ #include "bbtkUtilities.h" #include +#include + //#include "icons/cc_run.xpm" @@ -88,12 +90,11 @@ namespace bbtk : wxFrame((wxFrame *)parent, -1, _T("bbStudio"), wxDefaultPosition, wxSize(1200,800) ) { - // m_mgr = new wxAuiManager(this); m_mgr.SetManagedWindow(this); mInterpreter = bbtk::Interpreter::New(); mInterpreter->SetUser(this); - mInterpreter->SetCommandLine(true); + mInterpreter->SetCommandLine(true); mInterpreter->SetThrow(true); // mInterpreter->AddBreakObserver //boost::bind( &WxGUIScriptingInterface::InterpreterUserOnBreak, this )); @@ -109,13 +110,13 @@ namespace bbtk menuAbout->Append( ID_Menu_About, _T("&About...") ); wxMenu *menuTools = new wxMenu; - menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") ); + menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") ); menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &black box") ); - menuTools->Append( ID_Menu_PlugPackage, _T("&Plug package") ); + 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->Append( ID_Menu_RegenerateAll, _T("Regenerate &all") ); menuTools->AppendSeparator(); menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last graph") ); @@ -230,6 +231,7 @@ namespace bbtk .Bottom() .MinSize(wxSize(100,100)) ); + m_mgr.AddPane(mWxGUICommand, wxAuiPaneInfo().Name(wxT("command_content")) .Caption(wxT("Command")) @@ -242,8 +244,10 @@ namespace bbtk #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 + // Wx::SetTopWindowParent(this); + Wx::SetTopWindow(this); + // Wx::SetAutoDestroyTopWindow(false); + // Add the method OnWxSignal as a Wx::Signal observer //bbtkAddWxSignalObserver(WxGUIPackageBrowser2Window::OnWxSignal); //.PaneBorder(false)); @@ -262,22 +266,66 @@ namespace bbtk // LoadPerspective(); mBreaked = false; - - 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(); + + wxBitmap bitmap; + wxSplashScreen* splash; + long style = wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_TIMEOUT; + if (ConfigurationFile::GetInstance().DotBbtkIsNew()) + style = wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT; + std::string splash_file = ConfigurationFile::GetInstance().Get_data_path(); + splash_file += "/kernel/icons/bbStudioSplashScreen.png"; + + if (bitmap.LoadFile(std2wx(splash_file),wxBITMAP_TYPE_PNG)) + splash = + new wxSplashScreen(bitmap, + style, + 1000, 0, -1, wxDefaultPosition, wxDefaultSize, + wxSIMPLE_BORDER|wxSTAY_ON_TOP); + + if (ConfigurationFile::GetInstance().DotBbtkIsNew()) + { + + DoRegeneratePackageDoc("-a"); + DoRegenerateBoxesLists(); + + /* + 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(); + */ + if (splash) splash->Destroy(); + } + } //================================================================ //================================================================ WxGUIScriptingInterface::~WxGUIScriptingInterface() { + bbtkDebugMessage("widget",9,"bbStudio::~bbStudio()"<Close(); + } + this->Destroy(); + } + //================================================================ + + //================================================================ void WxGUIScriptingInterface::Open(const std::string& filename) { @@ -362,6 +410,62 @@ namespace bbtk } //================================================================ + + //================================================================ + void WxGUIScriptingInterface::WxGUITextEditorGraphSimple() + { + WxGUICommandEnter("exec freeze_no_error"); + WxGUITextEditorRun(); + WxGUICommandEnter("exec unfreeze"); + WxGUICommandEnter("graph"); + } + //================================================================ + + //================================================================ + void WxGUIScriptingInterface::WxGUITextEditorGraphDetail() + { + WxGUICommandEnter("exec freeze_no_error"); + WxGUITextEditorRun(); + WxGUICommandEnter("exec unfreeze"); + WxGUICommandEnter("graph . 1"); + } + //================================================================ + + + //================================================================ + void WxGUIScriptingInterface::WxGUITextEditorRunBBI() + { + std::string separator = ConfigurationFile::GetInstance().Get_file_separator (); + std::string dir = ConfigurationFile::GetInstance().Get_default_temp_dir(); + std::string filename = dir + separator + "tmp_bbtk.bbs"; + mWxGUITextEditor->GetCurrentPage()->SaveFile(filename); + + std::string command = "\""; + +#ifdef WIN32 + command += "\""; +#endif + + command += ConfigurationFile::GetInstance().Get_bin_path(); +#ifdef MACOSX + command += separator + "bbi.app/Contents/MacOS/bbi\" "; +#else + command += separator + "bbi\" "; +#endif + command += "\""+filename + "\""; + +#ifdef WIN32 + command += "\""; +#endif + + command += " & "; + + printf ("EED WxGUIScriptingInterface::WxGUITextEditorRunBBI %s \n" , command.c_str() ); + system( command.c_str() ); + } + //================================================================ + + //================================================================ void WxGUIScriptingInterface::WxGUITextEditorRun() { @@ -400,8 +504,8 @@ namespace bbtk void WxGUIScriptingInterface::OnMenuAbout(wxCommandEvent& WXUNUSED(event)) { m_mgr.Update(); - Refresh(); - wxMessageBox(_T(" bbStudio\nThe Black Box Toolkit Development Studio\n(c) CREATIS-LRMN 2008"), + Refresh(); + wxMessageBox(_T(" bbStudio\nThe Black Box Toolkit Development Studio\n(c) CREATIS-LRMN 2008\n\n http://www.creatis.insa-lyon.fr/creatools"), _T("About ..."), wxOK | wxICON_INFORMATION, this); } @@ -411,9 +515,12 @@ namespace bbtk //================================================================ void WxGUIScriptingInterface::OnMenuEditConfig(wxCommandEvent& WXUNUSED(event)) { + std::string configFile = ConfigurationFile::GetInstance().Get_config_xml_full_path(); Open(configFile); + wxMessageDialog ww(NULL,_T("If you change the bbtk_config.xml, you have to restart this appliaction..."), _T("Alert !"), wxOK); + ww.ShowModal(); } //================================================================ @@ -465,7 +572,6 @@ namespace bbtk command = "include toolsbbtk/appli/GUICreatePackage"; bbtkMessage("Debug",1,"Executing : '"<SendCommand(command); - } //================================================================ @@ -491,14 +597,25 @@ namespace bbtk //================================================================ void WxGUIScriptingInterface::OnMenuShowImageGraph(wxCommandEvent& WXUNUSED(event)) { - std::string default_temp_dir = ConfigurationFile::GetInstance().Get_default_temp_dir(); + std::string doc_path = bbtk::ConfigurationFile::GetInstance().Get_doc_path(); + doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator(); + doc_path += "bbdoc"; + doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator(); + + std::string pack_name("User"); + std::string pack_path = doc_path + pack_name; + #if defined(WIN32) std::string strappli="start "; #else - std::string strappli="gnome-open "; -#endif - std::string strcommand = strappli +default_temp_dir+"/temp_dir/workspace_workspacePrototype.png"; + #if defined(MACOSX) + std::string strappli="open "; + #else + std::string strappli="gnome-open "; + #endif +#endif + std::string strcommand = strappli +pack_path+"/workspace_workspacePrototype.png"; // std::cout << "system: " << strcommand << std::endl; system ( strcommand.c_str() ); @@ -507,11 +624,22 @@ namespace bbtk void WxGUIScriptingInterface::DoRegeneratePackageDoc( const std::string& pack ) { - std::string command; + std::string mess("Regenerating doc for package '"); + if (pack!="-a") + mess += pack + "'"; + else + mess = "Regenerating doc for all packages"; + mess += " ... please wait"; + + SetStatusText( std2wx(mess) ); + + BBTK_BUSY_CURSOR; + + std::string command; #if defined(WIN32) - command = "\""; + command = "\""; #endif - command += ConfigurationFile::GetInstance().Get_bin_path(); + command += ConfigurationFile::GetInstance().Get_bin_path(); command += ConfigurationFile::GetInstance().Get_file_separator(); command += "bbRegeneratePackageDoc"; #if defined(WIN32) @@ -519,15 +647,20 @@ namespace bbtk #endif command += " " + pack + " -q"; bbtkMessage("debug",1,"Executing system command '"<> pname; f.close(); - bbtk::ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path ); DoRegeneratePackageDoc(pname); DoRegenerateBoxesLists(); - - } + } } //================================================================ @@ -663,17 +805,49 @@ namespace bbtk { size_t s = target.length(); if ((s>3) && (target[s-1]=='s') - && (target[s-2]=='b') - && (target[s-3]=='b') - && (target[s-4]=='.')) - { - mWxGUITextEditor->Open(target); -#if NOTEBOOK - mwxNotebook->SetSelection(0); -#endif - mWxGUITextEditor->SetFocus(); - return false; - } + && (target[s-2]=='b') + && (target[s-3]=='b') + && (target[s-4]=='.')) + { + mWxGUITextEditor->Open(target); + #if NOTEBOOK + mwxNotebook->SetSelection(0); + #endif + mWxGUITextEditor->SetFocus(); + return false; + } + + if ((s>3) && (target[s-1]=='f') + && (target[s-2]=='d') + && (target[s-3]=='p') + && (target[s-4]=='.')) + { + + // Open pdf in linux + // gnome-open target + + // Open pdf in macOS + + // Open pdf in windows + int size=target.size(); + int pos=target.rfind("\\"); + std::string commandStart("start "); + std::string commandPath("/D \""+target.substr(0,pos) +"\""); + std::string commandPDF( target.substr(pos+1,size-pos+1) ); + + printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked cc %s \n",commandPath.c_str() ); + // cleanning path + while (commandPath.rfind("\\\\")!=-1 ) + { + commandPath.erase( commandPath.rfind("\\\\") , 1 ); + printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked cc %s \n",commandPath.c_str() ); + } + + std::string command = commandStart+commandPath+" "+commandPDF; + printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked BB %s \n",command.c_str() ); + system( command.c_str() ); + return false; + } return true; } //================================================================ @@ -691,7 +865,6 @@ namespace bbtk } } - //================================================================ void WxGUIScriptingInterface::OnMenuWindowsFiles(wxCommandEvent& event) { @@ -798,6 +971,7 @@ namespace bbtk //================================================================ BEGIN_EVENT_TABLE(WxGUIScriptingInterface, wxFrame) + EVT_CLOSE( WxGUIScriptingInterface::OnClose) EVT_MENU(ID_Menu_Quit, WxGUIScriptingInterface::OnMenuQuit) EVT_MENU(ID_Menu_About, WxGUIScriptingInterface::OnMenuAbout) EVT_MENU(ID_Menu_EditConfig, WxGUIScriptingInterface::OnMenuEditConfig)