X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=dda5bce5d86da8aae7dd4e081701721cb86b6c3f;hb=d209561c0b0ab22fd5b060dc0529c9a316b504d9;hp=2cec64923f836782efeb7a91f01a5cf07acb1266;hpb=a45d2dc35562aad94f11ce0c82dfe5f53155462e;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 2cec649..dda5bce 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -96,8 +96,8 @@ wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent)
 	initToolbar();
 	initPackageBrowser();
 	initTabPanelsManager();
-        // JGGR & CM  initHelpHTMLBrowser();
-        _helpHtmlBrowser = NULL;
+    // JGGR & CM  initHelpHTMLBrowser();
+    _helpHtmlBrowser = NULL;
 	CreateStatusBar();
 	_frameAUIMgr->Update();
 	_actualPkgBrowserBoxName = "";
@@ -107,7 +107,7 @@ wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent)
 	/////////////////////////////////
 	/// IMPORTANT!! FOR SAVE&LOAD PROCESSES THE VERSION IS VERY IMPORTANT.
 	/// RaC 2012 2nd Hackfest
-	_currentBBGversion="1.4";
+	_currentBBGversion="1.5";
 }
 
 //=========================================================================
@@ -568,8 +568,8 @@ void wxGUIEditorGraphicBBS::executeScript(std::string script) {
 	command += " & ";
 #endif
 
-#ifndef APPLE
-    command = "source ~/.profile; "+command;
+#ifdef __APPLE__
+    command = "source ~/.bbtk/profile_creatools; "+command;
 #endif
 
 
@@ -682,18 +682,16 @@ void wxGUIEditorGraphicBBS::OnEditDiagramProperties(wxCommandEvent& event)
 }
 
 //=========================================================================
-
-void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event) {
+void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event)
+{
 	std::string script1 = _tabsMgr->getActualDiagramBBS(true);
 	cout << endl << "RaC wxGUIEditorGraphicBBS::executeActualDiagram SCRIPT"
 			<< endl << endl;
 	cout << script1 << endl;
-
 	std::string script2 = _tabsMgr->getActualDiagramBBS(false);
 	executeScript(script2);
 }
 
-	
 //=========================================================================
 void wxGUIEditorGraphicBBS::OpenBBS(std::string filePathName, std::string fileName) 
 {
@@ -1557,23 +1555,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 +1573,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;
 }