X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=4c4854574e473fc8a168724975f6bb4f5ad729b4;hb=731d9ee262e286a24e3ea2776d8e914950840a2c;hp=c15e5996551ca429597292ddfa59b8073663f217;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index c15e599..4c48545 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: 2009/05/28 08:12:07 $ - Version: $Revision: 1.38 $ + Date: $Date: 2011/03/21 11:18:00 $ + Version: $Revision: 1.45 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -57,6 +57,7 @@ #include #include + //#include "icons/cc_run.xpm" namespace bbtk @@ -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") ); @@ -280,8 +281,7 @@ namespace bbtk style, 1000, 0, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxSTAY_ON_TOP); - - + if (ConfigurationFile::GetInstance().DotBbtkIsNew()) { @@ -440,7 +440,12 @@ namespace bbtk std::string filename = dir + separator + "tmp_bbtk.bbs"; mWxGUITextEditor->GetCurrentPage()->SaveFile(filename); - std::string command = "\""; + std::string command = "\""; + +#ifdef WIN32 + command += "\""; +#endif + command += ConfigurationFile::GetInstance().Get_bin_path(); #ifdef MACOSX command += separator + "bbi.app/Contents/MacOS/bbi\" "; @@ -448,6 +453,11 @@ namespace bbtk command += separator + "bbi\" "; #endif command += "\""+filename + "\""; + +#ifdef WIN32 + command += "\""; +#endif + command += " & "; printf ("EED WxGUIScriptingInterface::WxGUITextEditorRunBBI %s \n" , command.c_str() ); @@ -494,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/site/en/CreaTools_home"), _T("About ..."), wxOK | wxICON_INFORMATION, this); } @@ -505,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(); } //================================================================ @@ -559,7 +572,6 @@ namespace bbtk command = "include toolsbbtk/appli/GUICreatePackage"; bbtkMessage("Debug",1,"Executing : '"<SendCommand(command); - } //================================================================ @@ -592,8 +604,7 @@ namespace bbtk doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator(); std::string pack_name("User"); - std::string pack_path = doc_path + pack_name; - + std::string pack_path = doc_path + pack_name; #if defined(WIN32) std::string strappli="start "; @@ -603,8 +614,7 @@ namespace bbtk #else std::string strappli="gnome-open "; #endif -#endif - +#endif std::string strcommand = strappli +pack_path+"/workspace_workspacePrototype.png"; // std::cout << "system: " << strcommand << std::endl; system ( strcommand.c_str() ); @@ -655,9 +665,6 @@ namespace bbtk err += bbtk::std2wx(command) + _T("'"); wxMessageBox(err,_T("Regenerate package doc"),wxOK | wxICON_ERROR); } - - - } @@ -694,8 +701,7 @@ namespace bbtk command += " -q"; bbtkMessage("debug",1,"Executing system command '"<> pname; f.close(); - bbtk::ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path ); DoRegeneratePackageDoc(pname); DoRegenerateBoxesLists(); - - } + } } //================================================================ @@ -801,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; } //================================================================ @@ -829,7 +865,6 @@ namespace bbtk } } - //================================================================ void WxGUIScriptingInterface::OnMenuWindowsFiles(wxCommandEvent& event) {