Skip to content

Commit eaf379a

Browse files
author
Matthias Kastner
committed
ws fix
1 parent 3b11387 commit eaf379a

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

procedures/CodeBrowser.ipf

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,11 @@ Function addDecoratedConstants(module, procedureWithoutModule, declWave, lineWa
333333
// get procedure code
334334
procText = getProcedureText(module, procedureWithoutModule)
335335
numLines = ItemsInList(procText, "\r")
336-
336+
337337
// search code and return wavLineNumber
338338
Make/FREE/N=(numLines)/T text = StringFromList(p, procText, "\r")
339339
re = "^(?i)[[:space:]]*((?:override)?(?:static)?[[:space:]]*(?:Str)?Constant)[[:space:]]+(.*)=.*"
340-
Grep/Q/INDX/E=re text
340+
Grep/Q/INDX/E=re text
341341
Wave W_Index
342342
Duplicate/FREE W_Index wavLineNumber
343343
KillWaves/Z W_Index
@@ -470,12 +470,12 @@ Function addDecoratedStructure(module, procedureWithoutModule, declWave, lineWa
470470
if (parseVariables)
471471
Duplicate/FREE/R=[(wavStructureStart[(idx - numEntries)]),(wavStructureEnd[(idx - numEntries)])] text, temp
472472
declWave[idx][1] += getStructureElements(temp)
473-
WaveClear temp
473+
WaveClear temp
474474
endif
475475

476476
lineWave[idx] = wavStructureStart[(idx - numEntries)]
477477
endfor
478-
478+
479479
WaveClear wavStructureStart, wavStructureEnd
480480
End
481481

@@ -562,12 +562,12 @@ End
562562
static Function sortListByLineNumber(decls, lines)
563563
Wave/T decls
564564
Wave/D lines
565-
565+
566566
// check if sort is necessary
567567
if (Dimsize(decls,0) * Dimsize(lines,0) == 0)
568568
return 0
569569
endif
570-
570+
571571
Duplicate/T/FREE/R=[][0] decls, declCol0
572572
Duplicate/T/FREE/R=[][1] decls, declCol1
573573
Sort/A lines, lines, declCol0, declCol1
@@ -578,12 +578,12 @@ End
578578
static Function sortListByName(decls, lines)
579579
Wave/T decls
580580
Wave/D lines
581-
581+
582582
// check if sort is necessary
583583
if (Dimsize(decls,0) * Dimsize(lines,0) == 0)
584584
return 0
585585
endif
586-
586+
587587
Duplicate/T/FREE/R=[][0] decls, declCol0
588588
Duplicate/T/FREE/R=[][1] decls, declCol1
589589
Sort/A declCol1, lines, declCol0, declCol1
@@ -864,9 +864,8 @@ Function searchAndDelete(decls, lines, searchString)
864864
Wave/T decls
865865
Wave/I lines
866866
String searchString
867-
868867
Variable i, numEntries
869-
868+
870869
// search and delete backwards for simplicity reasons
871870
numEntries = Dimsize(decls, 0)
872871
for (i = numEntries - 1; i > 0; i -= 1)

procedures/CodeBrowser_gui.ipf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Function createPanel()
7070
DefineGuide/W=$panel UGH1={FB,panelBorder}
7171
DefineGuide/W=$panel UGHL={FL,panelBorder}
7272
DefineGuide/W=$panel UGHR={FR,panelBorder}
73-
73+
7474
ListBox $listCtrl, win=$panel,pos={panelBorder,panelTopHeight + panelBorder}, size={panelWidth-2*panelBorder, panelHeight-panelTopHeight-2*panelBorder}
7575
ListBox $listCtrl, win=$panel,proc=$(module + "#ListBoxProc")
7676
ListBox $listCtrl, win=$panel,mode=5,selCol=1, widths={4,40}, keySelectCol=1
@@ -90,7 +90,7 @@ Function createPanel()
9090
CheckBox $sortCtrl, userdata(ResizeControlsInfo) += A"zzz!!#N3Bk1ct<C]S6zzzzzzzzzzzzz!!!"
9191

9292
setGlobalStr("search", "")
93-
93+
9494
SetVariable $searchCtrl, pos={panelBorder + 118, SortCtrlTop - 2}, size={175.00, 18.00}, proc=$(module + "#searchSet"),title = "search"
9595
SetVariable $searchCtrl, limits={-inf,inf,0}, value=$(pkgFolder + ":search"), live = 1
9696

@@ -400,7 +400,7 @@ Function checkboxSort(cba) : CheckBoxControl
400400
End
401401

402402
// returns 0 if checkbox is deselected or 1 if it is selected.
403-
Function returnCheckBoxSort()
403+
Function returnCheckBoxSort()
404404
ControlInfo/W=$panel $sortCtrl
405405
if (V_flag == 2) // Checkbox found?
406406
return V_Value

procedures/CodeBrowser_hooks.ipf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Function initializePanel()
5050
if (!(V_flag == 0))
5151
debugPrint("Error: SetIgorOption returned " + num2str(V_flag))
5252
endif
53-
53+
5454
Execute/Z/Q "SetIgorOption recreateListboxHScroll=1"
5555
if (!(V_flag == 0))
5656
debugPrint("Error: SetIgorOption returned " + num2str(V_flag))

procedures/CodeBrowser_preferences.ipf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ static Function SyncPackagePrefsStruct(prefs)
7676
prefs.panelCoords[1] = V_top * scale
7777
prefs.panelCoords[2] = V_right * scale
7878
prefs.panelCoords[3] = V_bottom * scale
79-
79+
8080
prefs.panelCheckboxSort = returnCheckBoxSort()
8181

8282
selectedItem = getCurrentItemAsNumeric(module = 1)
8383
prefs.panelNameSpace = selectedItem < 0 ? 1 : selectedItem
8484

8585
selectedItem = getCurrentItemAsNumeric(procedure = 1)
8686
prefs.panelProcedure = selectedItem < 0 ? 1 : selectedItem
87-
87+
8888
selectedItem = getCurrentItemAsNumeric(index = 1)
8989
prefs.panelElement = selectedItem < 0 ? 0 : selectedItem
90-
90+
9191
selectedItem = getCurrentItemAsNumeric(indexTop = 1)
9292
prefs.panelTopElement = selectedItem < 0 ? 0 : selectedItem
9393

0 commit comments

Comments
 (0)