X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=0ba3bbbf1c5d410109d359d5d770cf8ebc96fe7d;hb=8fc50de315bff81bdbcc672c38e56926a9e1bd5c;hp=1a1357df14f1078d89b37dade99e58831b673818;hpb=bf36ff525b01e0ec957a0c75921b901ea4cc4899;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index 1a1357d..0ba3bbb 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -568,7 +568,7 @@ void wxGUIEditorGraphicBBS::executeScript(std::string script) { command += " & "; #endif -#ifndef APPLE +#ifdef __APPLE__ command = "source ~/.bbtk/profile_creatools; "+command; #endif @@ -1557,23 +1557,15 @@ bool wxGUIEditorGraphicBBS::TryToOpenScriptComplexBox(std::string packageName ,s //========================================================================= bool wxGUIEditorGraphicBBS::TryToOpenScript(std::string packageName ,std::string boxType,bool scriptApplication, bool scriptComplexBox) { - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript Start\n "); Package::Pointer k; std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc; BlackBoxDescriptor::Pointer descriptor; - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 1\n "); k = GetBBTKFactory()->GetPackage(packageName); - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 2\n "); mapDesc = k->GetDescriptorMap(); - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 3\n "); descriptor = mapDesc[boxType]; - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 3.1 packageName:%s boxType:%s \n",packageName.c_str(), boxType.c_str() ); - - if (descriptor==NULL) printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 3.2\n AUUCHH "); - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 3.2\n "); bool result=false; -descriptor->IsTypeOfScript_Application(); + descriptor->IsTypeOfScript_Application(); if (descriptor!=NULL) { if ( @@ -1583,16 +1575,12 @@ descriptor->IsTypeOfScript_Application(); ) { result=true; - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 4\n "); OpenScript(descriptor->GetScriptFileName(),boxType); - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript 5\n "); } // if descriptor Type } else { printf("EED ERROR wxGUIEditorGraphicBBS::TryToOpenScript >> The descriptor of this box not exists (packageName:%s boxType:%s) this is not normal\n",packageName.c_str(), boxType.c_str() ); } // if descriptor NULL - printf("EED wxGUIEditorGraphicBBS::TryToOpenScript END\n "); - return result; }