From: davila <> Date: Wed, 14 Nov 2012 09:48:33 +0000 (+0000) Subject: Bug #1760 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fe36963b84afb7b9ddd3d8b38fe09b467c91c751;p=bbtkGEditor.git Bug #1760 Avoid put a ScriptApplication in the workArea (just edit the script) --- diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx index 104b095..dd4adcb 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx @@ -109,53 +109,7 @@ namespace bbtk { _sceneManager->createGBlackBox(x,y,packageName, boxType); saveTempandUpdate("drop box"); - } - -/*EED Borrame - >>>>>> TryToOpenScriptApplication - Package::Pointer k; - std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc; - BlackBoxDescriptor::Pointer descriptor; - k = _bbtkfactory->GetPackage(packageName); - mapDesc = k->GetDescriptorMap(); - descriptor = mapDesc[boxType]; - - if (descriptor->IsTypeOfScript_Application()==true) - { - OpenScript(descriptor->GetScriptFileName(),boxType); - >>>>> OpenScript - printf("EED wxGEditorTabPanel::OnDropText packageName=%s boxType=%s APPLI ScriptFileName=%s\n", packageName.c_str() , boxType.c_str() , descriptor->GetScriptFileName().c_str() ); - std::string fileName = boxType+".bbg"; - std::string filePathNameBBS = descriptor->GetScriptFileName(); - std::string filePathNameBBG = filePathNameBBS; - filePathNameBBG[ filePathNameBBG.length()-1 ] = 'g'; - - wxMessageDialog windowMessage1(NULL,_T("The system is going to open a bbg or bbs for you. Be careful if you save this file."), _T("Alert !"), wxOK); - windowMessage1.ShowModal(); - - if ( Utilities::FileExists( filePathNameBBG ) ) - { - _panelsManager->OpenDiagram( filePathNameBBG , fileName ); - } else { - if ( Utilities::FileExists( filePathNameBBS ) ) - { - _panelsManager->OpenBBS( filePathNameBBS , fileName ); - } else { - wxMessageDialog windowMessage1(NULL,_T("..ERROR.. loading script bbg/bbs."), _T("Alert !"), wxOK); - windowMessage1.ShowModal(); - } - } - <<<<< - } - <<<<<<< -// EED Borrame -// else { -// _sceneManager->createGBlackBox(x,y,packageName, boxType); -// saveTempandUpdate("drop box"); -// } - - */ - + } return true; } diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx index 6aa897c..6456c6a 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx @@ -379,7 +379,7 @@ printf("wxTabPanelsManager::VerifyActualTabPanel %d \n", this->_notebook->GetPa //========================================================================= bool wxTabPanelsManager::TryToOpenScriptApplication(std::string packageName ,std::string boxType) { - _parent->TryToOpenScriptApplication( packageName, boxType ); + return _parent->TryToOpenScriptApplication( packageName, boxType ); } } // EO namespace bbtk