Merge branch 'mk/config' into mk/master

* mk/config:
  config: debugging state
  config: Optional clean on exit

Author: Matthias Kastner

procedures/CodeBrowser.ipf

@@ -46,7 +46,6 @@ static StrConstant CsaveWaves 		= "saveWaves"
 static Constant CsaveMaximum = 1024
 
 Constant    openKey           = 46 // ".", the dot
-Constant    debuggingEnabled  = 0
 
 // List of available macro subtypes
 StrConstant subTypeList       = "Graph;GraphStyle;GraphMarquee;Table;TableStyle;Layout;LayoutStyle;LayoutMarquee;ListBoxControl;Panel;ButtonControl;CheckBoxControl;PopupMenuControl;SetVariableControl"
@@ -96,7 +95,7 @@ Function/S interpretParamType(ptype, paramOrReturn)
 			typeStr += "/U"
 		endif
 
-//		if(debuggingEnabled)
+//		if(getGlobalVar("debuggingEnabled") == 1)
 //			string msg
 //			sprintf msg, "type:%d, str:%s", ptype, typeStr
 //			debugPrint(msg)
@@ -317,11 +316,9 @@ Function addDecoratedFunctions(module, procedure, declWave, lineWave)
 		lineWave[idx]    = NumberByKey("PROCLINE", fi)
 	endfor
 
-	if(debuggingEnabled)
-		string msg
-		sprintf msg, "decl rows=%d\r", DimSize(declWave,0)
-		debugPrint(msg)
-	endif
+	string msg
+	sprintf msg, "decl rows=%d\r", DimSize(declWave,0)
+	debugPrint(msg)
 End
 
 // Adds Constants/StrConstants by searching for them in the Procedure with a Regular Expression
@@ -890,7 +887,6 @@ End
 
 Function searchReset()
 	setGlobalStr("search","")
-	killGlobalStr("search")
 End
 
 Function DeletePKGfolder()

procedures/CodeBrowser_hooks.ipf

@@ -70,9 +70,6 @@ Function preparePanelClose()
 	SetIgorHook/K AfterCompiledHook=updatePanel
 	debugPrint("AfterCompiledHook: " + S_info)
 
-	// storage data should not be saved in experiment
-	saveResetStorage()
-
 	DoWindow $GetPanel()
 	if(V_flag == 0)
 		return 0
@@ -82,12 +79,20 @@ Function preparePanelClose()
 	STRUCT CodeBrowserPrefs prefs
 	FillPackagePrefsStruct(prefs)
 	SavePackagePrefsToDisk(prefs)
-	
+
 	// reset global gui variables
 	searchReset()
 
-	// clean Package DataFolder
-	DeletePKGfolder()
+	// delete CodeBrowser related data
+	if(prefs.configCleanOnExit)
+		// storage data will not be saved in experiment
+		saveResetStorage()
+		killGlobalStr("search")
+		killGlobalVar("cleanOnExit")
+		killGlobalVar("debuggingEnabled")
+		// clean Package DataFolder
+		DeletePKGfolder()
+	endif
 End
 
 Function panelHook(s)

procedures/CodeBrowser_preferences.ipf

@@ -6,7 +6,7 @@
 // This file was created by () byte physics Thomas Braun, [email protected]
 // (c) 2013
 
-static Constant kPrefsVersion = 105
+static Constant kPrefsVersion = 107
 static StrConstant kPackageName = "CodeBrowser"
 static StrConstant kPrefsFileName = "CodeBrowser.bin"
 static Constant kPrefsRecordID = 0
@@ -19,7 +19,9 @@ Structure CodeBrowserPrefs
 	uint32 panelProcedure	// last marked procedure in panel
 	uint32 panelElement	// last marked element in panel
 	uint32 panelTopElement // top element in listbox (scrolling)
-	uint32 reserved[95]	// Reserved for future use
+	uint32 configCleanOnExit // delete CodeBrowser related data when CodeBrowser exits
+	uint32 configDebuggingEnabled // enable messages for debugging purpose
+	uint32 reserved[93]	// Reserved for future use
 EndStructure
 
 //	DefaultPackagePrefsStruct(prefs)
@@ -47,16 +49,19 @@ static Function DefaultPackagePrefsStruct(prefs)
 	prefs.panelElement   = 0
 	prefs.panelTopElement= 0
 
+	prefs.configCleanOnExit = 1
+	prefs.configDebuggingEnabled = 0
+
 	Variable i
-	for(i=0; i<95; i+=1)
+	for(i=0; i<93; i+=1)
 		prefs.reserved[i] = 0
 	endfor
 End
 
 // Fill package prefs structures to match state of panel.
 static Function SyncPackagePrefsStruct(prefs)
 	STRUCT CodeBrowserPrefs &prefs
-	Variable scale, selectedItem
+	Variable scale, selectedItem, configItem
 	// Panel does exists. Set prefs to match panel settings.
 	prefs.version = kPrefsVersion
 
@@ -85,6 +90,12 @@ static Function SyncPackagePrefsStruct(prefs)
 
 	selectedItem = getCurrentItemAsNumeric(indexTop = 1)
 	prefs.panelTopElement   = selectedItem < 0 ? 0 : selectedItem
+
+	configItem = getGlobalVar("cleanOnExit")
+	prefs.configCleanOnExit = configItem < 0 ? 1 : configItem
+
+	configItem = getGlobalVar("debuggingEnabled")
+	prefs.configDebuggingEnabled = configItem < 0 ? 0 : configItem
 End
 
 // InitPackagePrefsStruct(prefs)
@@ -125,6 +136,8 @@ Function LoadPackagePrefsFromDisk(prefs)
 	prefs.panelCoords[2] /= scale
 	prefs.panelCoords[3] /= scale
 
+	setGlobalVar("cleanOnExit", prefs.configCleanOnExit)
+	setGlobalVar("debuggingEnabled", prefs.configDebuggingEnabled)
 End
 
 Function SavePackagePrefsToDisk(prefs)

procedures/CodeBrowser_utils.ipf

@@ -86,7 +86,7 @@ End
 Function debugPrint(msg)
 	string msg
 
-	if(debuggingEnabled)
+	if(getGlobalVar("debuggingEnabled") == 1)
 		printf "%s(...): %s\r", GetRTStackInfo(2), RemoveEnding(msg,"\r")
 	endif
 End
@@ -278,4 +278,4 @@ Function timerStop(timerRefNum)
 
 	microseconds = stopMSTimer(timerRefNum)
 	return microseconds
-End
+End