Skip to content

Commit 8cbc81c

Browse files
author
Matthias Kastner
committed
config: debugging state
globally save debugging state in CodeBrowser prefs.
1 parent 68d5b18 commit 8cbc81c

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

procedures/CodeBrowser.ipf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ static StrConstant CsaveWaves = "saveWaves"
4646
static Constant CsaveMaximum = 1024
4747

4848
Constant openKey = 46 // ".", the dot
49-
Constant debuggingEnabled = 0
5049

5150
// List of available macro subtypes
5251
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)
9695
typeStr += "/U"
9796
endif
9897

99-
// if(debuggingEnabled)
98+
// if(getGlobalVar("debuggingEnabled") == 1)
10099
// string msg
101100
// sprintf msg, "type:%d, str:%s", ptype, typeStr
102101
// debugPrint(msg)
@@ -317,11 +316,9 @@ Function addDecoratedFunctions(module, procedure, declWave, lineWave)
317316
lineWave[idx] = NumberByKey("PROCLINE", fi)
318317
endfor
319318

320-
if(debuggingEnabled)
321-
string msg
322-
sprintf msg, "decl rows=%d\r", DimSize(declWave,0)
323-
debugPrint(msg)
324-
endif
319+
string msg
320+
sprintf msg, "decl rows=%d\r", DimSize(declWave,0)
321+
debugPrint(msg)
325322
End
326323

327324
// Adds Constants/StrConstants by searching for them in the Procedure with a Regular Expression

procedures/CodeBrowser_hooks.ipf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Function preparePanelClose()
8989
saveResetStorage()
9090
killGlobalStr("search")
9191
killGlobalVar("cleanOnExit")
92+
killGlobalVar("debuggingEnabled")
9293
// clean Package DataFolder
9394
DeletePKGfolder()
9495
endif

procedures/CodeBrowser_preferences.ipf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// This file was created by () byte physics Thomas Braun, [email protected]
77
// (c) 2013
88

9-
static Constant kPrefsVersion = 106
9+
static Constant kPrefsVersion = 107
1010
static StrConstant kPackageName = "CodeBrowser"
1111
static StrConstant kPrefsFileName = "CodeBrowser.bin"
1212
static Constant kPrefsRecordID = 0
@@ -20,7 +20,8 @@ Structure CodeBrowserPrefs
2020
uint32 panelElement // last marked element in panel
2121
uint32 panelTopElement // top element in listbox (scrolling)
2222
uint32 configCleanOnExit // delete CodeBrowser related data when CodeBrowser exits
23-
uint32 reserved[94] // Reserved for future use
23+
uint32 configDebuggingEnabled // enable messages for debugging purpose
24+
uint32 reserved[93] // Reserved for future use
2425
EndStructure
2526

2627
// DefaultPackagePrefsStruct(prefs)
@@ -49,9 +50,10 @@ static Function DefaultPackagePrefsStruct(prefs)
4950
prefs.panelTopElement= 0
5051

5152
prefs.configCleanOnExit = 1
53+
prefs.configDebuggingEnabled = 0
5254

5355
Variable i
54-
for(i=0; i<94; i+=1)
56+
for(i=0; i<93; i+=1)
5557
prefs.reserved[i] = 0
5658
endfor
5759
End
@@ -91,6 +93,9 @@ static Function SyncPackagePrefsStruct(prefs)
9193

9294
configItem = getGlobalVar("cleanOnExit")
9395
prefs.configCleanOnExit = configItem < 0 ? 1 : configItem
96+
97+
configItem = getGlobalVar("debuggingEnabled")
98+
prefs.configDebuggingEnabled = configItem < 0 ? 0 : configItem
9499
End
95100

96101
// InitPackagePrefsStruct(prefs)
@@ -132,6 +137,7 @@ Function LoadPackagePrefsFromDisk(prefs)
132137
prefs.panelCoords[3] /= scale
133138

134139
setGlobalVar("cleanOnExit", prefs.configCleanOnExit)
140+
setGlobalVar("debuggingEnabled", prefs.configDebuggingEnabled)
135141
End
136142

137143
Function SavePackagePrefsToDisk(prefs)

procedures/CodeBrowser_utils.ipf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ End
8686
Function debugPrint(msg)
8787
string msg
8888

89-
if(debuggingEnabled)
89+
if(getGlobalVar("debuggingEnabled") == 1)
9090
printf "%s(...): %s\r", GetRTStackInfo(2), RemoveEnding(msg,"\r")
9191
endif
9292
End
@@ -278,4 +278,4 @@ Function timerStop(timerRefNum)
278278

279279
microseconds = stopMSTimer(timerRefNum)
280280
return microseconds
281-
End
281+
End

0 commit comments

Comments
 (0)