Skip to content

Commit 67c22d2

Browse files
MichaelHuthMichaelHuth
committed
SF Tests: Use constant for future proof name generation of SF graph/table window
1 parent 978cd00 commit 67c22d2

File tree

2 files changed

+70
-64
lines changed

2 files changed

+70
-64
lines changed

‎Packages/tests/Basic/UTF_SweepFormula.ipf‎

Lines changed: 67 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ static Function TestPlotting()
738738
Duplicate/FREE globalscale1D, scale1D
739739
JWN_SetStringInWaveNote(scale1D, SF_META_FORMULA, strScale1D)
740740

741-
win = winBase + "_graph#graph" + "0"
741+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
742742

743743
MIES_SF#SF_FormulaPlotter(sweepBrowser, strArray2D)
744744
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
@@ -850,13 +850,13 @@ static Function TestPlotting()
850850
Make/FREE/D wvX1ref = {{7, 8}}
851851
CHECK_EQUAL_WAVES(wvX1, wvX1ref)
852852

853-
win = winBase + "_graph0"
853+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "0"
854854
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
855855
KillWindow/Z $win
856-
win = winBase + "_graph1"
856+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "1"
857857
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
858858
KillWindow/Z $win
859-
win = winBase + "_graph2"
859+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "2"
860860
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
861861
KillWindow/Z $win
862862

@@ -867,13 +867,13 @@ static Function TestPlotting()
867867
PASS()
868868
endtry
869869
DoUpdate
870-
win = winBase + "_graph0"
870+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "0"
871871
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
872-
win = winBase + "_graph1"
872+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "1"
873873
REQUIRE_EQUAL_VAR(WindowExists(win), 0)
874874

875875
MIES_SF#SF_FormulaPlotter(sweepBrowser, strCombined, dmMode = SF_DM_SUBWINDOWS); DoUpdate
876-
win = winBase + "_graph"
876+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH
877877
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
878878
for(i = 0; i < 4; i += 1)
879879
gInfo = GuideInfo(win, "HOR" + num2istr(i))
@@ -889,11 +889,11 @@ static Function TestPlotting()
889889
refStr = "FB"
890890
CHECK_EQUAL_STR(tmpStr, refStr)
891891
endfor
892-
win = winBase + "_graph#graph" + "0"
892+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
893893
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
894-
win = winBase + "_graph#graph" + "1"
894+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "1"
895895
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
896-
win = winBase + "_graph#graph" + "2"
896+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "2"
897897
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
898898

899899
try
@@ -904,21 +904,21 @@ static Function TestPlotting()
904904
endtry
905905

906906
MIES_SF#SF_FormulaPlotter(sweepBrowser, strWith)
907-
win = winBase + "_graph#graph" + "0"
907+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
908908
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
909909
WAVE wvWin0Y0 = WaveRefIndexed(win, 0, 1)
910910
WAVE wvWin0Y1 = WaveRefIndexed(win, 1, 1)
911911
WAVE wvWin0X0 = WaveRefIndexed(win, 0, 2)
912912
WAVE wvWin0X1 = WaveRefIndexed(win, 1, 2)
913-
win = winBase + "_graph#graph" + "1"
913+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "1"
914914
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
915915
WAVE wvWin1Y0 = WaveRefIndexed(win, 0, 1)
916916
WAVE wvWin1Y1 = WaveRefIndexed(win, 1, 1)
917917
WAVE wvWin1Y2 = WaveRefIndexed(win, 2, 1)
918918
WAVE wvWin1X0 = WaveRefIndexed(win, 0, 2)
919919
WAVE wvWin1X1 = WaveRefIndexed(win, 1, 2)
920920
WAVE wvWin1X2 = WaveRefIndexed(win, 2, 2)
921-
win = winBase + "_graph#graph" + "2"
921+
win = winBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "2"
922922
REQUIRE_EQUAL_VAR(WindowExists(win), 1)
923923
WAVE wvWin2Y0 = WaveRefIndexed(win, 0, 1)
924924
WAVE wvY0 = GetSweepFormulaY(dfr, 0)
@@ -966,7 +966,7 @@ End
966966

967967
static Function TestPlottingWithTablesSubWindows()
968968

969-
string win, winBaseTable, winBaseGraph
969+
string win, winBaseTable, winBaseGraph, subwinTable0, subwinTable1, subwinTable2, subwinGraph0, subwinGraph1
970970
string traceName, tInfo, recMacro
971971

972972
string sweepBrowser = CreateFakeSweepBrowser_IGNORE()
@@ -982,106 +982,111 @@ static Function TestPlottingWithTablesSubWindows()
982982
string strSimpleTableDataset = "table(dataset(1,2))"
983983
string strMixingChain = "2\rwith\rtable(3)\rwith\r4\rwith\rtable(5)"
984984

985-
winBaseTable = winBase + "table"
986-
winBaseGraph = winBase + "graph"
985+
winBaseTable = winBase + SF_WINNAME_SUFFIX_TABLE
986+
winBaseGraph = winBase + SF_WINNAME_SUFFIX_GRAPH
987+
subwinTable0 = winBaseTable + "#" + SF_WINNAME_SUFFIX_TABLE + "0"
988+
subwinTable1 = winBaseTable + "#" + SF_WINNAME_SUFFIX_TABLE + "1"
989+
subwinTable2 = winBaseTable + "#" + SF_WINNAME_SUFFIX_TABLE + "2"
990+
subwinGraph0 = winBaseGraph + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
991+
subwinGraph1 = winBaseGraph + "#" + SF_WINNAME_SUFFIX_GRAPH + "1"
987992

988993
MIES_SF#SF_FormulaPlotter(sweepBrowser, strSimpleTable)
989994
CHECK_EQUAL_VAR(WindowExists(winBaseTable), 1)
990-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table0"), 1)
991-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table1"), 0)
995+
CHECK_EQUAL_VAR(WindowExists(subwinTable0), 1)
996+
CHECK_EQUAL_VAR(WindowExists(subwinTable1), 0)
992997
CHECK_EQUAL_VAR(WindowExists(winBaseGraph), 0)
993-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 0, 3) // data column
998+
WAVE wv = WaveRefIndexed(subwinTable0, 0, 3) // data column
994999
CHECK_EQUAL_WAVES(wv, {{1}}, mode = WAVE_DATA)
995-
WAVE/Z wv = WaveRefIndexed(winBaseTable + "#table0", 1, 3)
1000+
WAVE/Z wv = WaveRefIndexed(subwinTable0, 1, 3)
9961001
CHECK_WAVE(wv, NULL_WAVE)
9971002

9981003
MIES_SF#SF_FormulaPlotter(sweepBrowser, strSimpleTableWithTable)
9991004
CHECK_EQUAL_VAR(WindowExists(winBaseTable), 1)
1000-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table0"), 1)
1001-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table1"), 0)
1005+
CHECK_EQUAL_VAR(WindowExists(subwinTable0), 1)
1006+
CHECK_EQUAL_VAR(WindowExists(subwinTable1), 0)
10021007
CHECK_EQUAL_VAR(WindowExists(winBaseGraph), 0)
1003-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 0, 3) // data column first table
1008+
WAVE wv = WaveRefIndexed(subwinTable0, 0, 3) // data column first table
10041009
CHECK_EQUAL_WAVES(wv, {{1}}, mode = WAVE_DATA)
1005-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 1, 3) // data column second table
1010+
WAVE wv = WaveRefIndexed(subwinTable0, 1, 3) // data column second table
10061011
CHECK_EQUAL_WAVES(wv, {{2}}, mode = WAVE_DATA)
1007-
WAVE/Z wv = WaveRefIndexed(winBaseTable + "#table0", 2, 3)
1012+
WAVE/Z wv = WaveRefIndexed(subwinTable0, 2, 3)
10081013
CHECK_WAVE(wv, NULL_WAVE)
10091014

10101015
MIES_SF#SF_FormulaPlotter(sweepBrowser, strSimpleTableWithPlot)
10111016
CHECK_EQUAL_VAR(WindowExists(winBaseTable), 1)
1012-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table0"), 1)
1013-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table1"), 0)
1017+
CHECK_EQUAL_VAR(WindowExists(subwinTable0), 1)
1018+
CHECK_EQUAL_VAR(WindowExists(subwinTable1), 0)
10141019
CHECK_EQUAL_VAR(WindowExists(winBaseGraph), 1)
1015-
CHECK_EQUAL_VAR(WindowExists(winBaseGraph + "#graph0"), 1)
1016-
CHECK_EQUAL_VAR(WindowExists(winBaseGraph + "#graph1"), 0)
1020+
CHECK_EQUAL_VAR(WindowExists(subwinGraph0), 1)
1021+
CHECK_EQUAL_VAR(WindowExists(subwinGraph1), 0)
10171022

10181023
MIES_SF#SF_FormulaPlotter(sweepBrowser, strSimpleTableVsX)
10191024
CHECK_EQUAL_VAR(WindowExists(winBaseTable), 1)
1020-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table0"), 1)
1021-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table1"), 0)
1025+
CHECK_EQUAL_VAR(WindowExists(subwinTable0), 1)
1026+
CHECK_EQUAL_VAR(WindowExists(subwinTable1), 0)
10221027
CHECK_EQUAL_VAR(WindowExists(winBaseGraph), 0)
10231028

10241029
MIES_SF#SF_FormulaPlotter(sweepBrowser, strSimpleTableAndTable)
10251030
CHECK_EQUAL_VAR(WindowExists(winBaseTable), 1)
1026-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table0"), 1)
1027-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table1"), 1)
1028-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table2"), 0)
1031+
CHECK_EQUAL_VAR(WindowExists(subwinTable0), 1)
1032+
CHECK_EQUAL_VAR(WindowExists(subwinTable1), 1)
1033+
CHECK_EQUAL_VAR(WindowExists(subwinTable2), 0)
10291034
CHECK_EQUAL_VAR(WindowExists(winBaseGraph), 0)
1030-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 0, 3) // data column
1035+
WAVE wv = WaveRefIndexed(subwinTable0, 0, 3) // data column
10311036
CHECK_EQUAL_WAVES(wv, {{1}}, mode = WAVE_DATA)
1032-
WAVE/Z wv = WaveRefIndexed(winBaseTable + "#table0", 1, 3)
1037+
WAVE/Z wv = WaveRefIndexed(subwinTable0, 1, 3)
10331038
CHECK_WAVE(wv, NULL_WAVE)
1034-
WAVE wv = WaveRefIndexed(winBaseTable + "#table1", 0, 3) // data column
1039+
WAVE wv = WaveRefIndexed(subwinTable1, 0, 3) // data column
10351040
CHECK_EQUAL_WAVES(wv, {{2}}, mode = WAVE_DATA)
1036-
WAVE/Z wv = WaveRefIndexed(winBaseTable + "#table1", 1, 3)
1041+
WAVE/Z wv = WaveRefIndexed(subwinTable1, 1, 3)
10371042
CHECK_WAVE(wv, NULL_WAVE)
10381043

10391044
MIES_SF#SF_FormulaPlotter(sweepBrowser, strSimpleTableAndPlot)
10401045
CHECK_EQUAL_VAR(WindowExists(winBaseTable), 1)
1041-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table0"), 1)
1042-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table1"), 0)
1046+
CHECK_EQUAL_VAR(WindowExists(subwinTable0), 1)
1047+
CHECK_EQUAL_VAR(WindowExists(subwinTable1), 0)
10431048
CHECK_EQUAL_VAR(WindowExists(winBaseGraph), 1)
1044-
CHECK_EQUAL_VAR(WindowExists(winBaseGraph + "#graph0"), 1)
1045-
CHECK_EQUAL_VAR(WindowExists(winBaseGraph + "#graph1"), 0)
1049+
CHECK_EQUAL_VAR(WindowExists(subwinGraph0), 1)
1050+
CHECK_EQUAL_VAR(WindowExists(subwinGraph1), 0)
10461051

10471052
MIES_SF#SF_FormulaPlotter(sweepBrowser, strSimpleTableDataset)
1048-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 0, 3) // data column
1053+
WAVE wv = WaveRefIndexed(subwinTable0, 0, 3) // data column
10491054
CHECK_EQUAL_WAVES(wv, {{1}}, mode = WAVE_DATA)
1050-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 1, 3) // data column
1055+
WAVE wv = WaveRefIndexed(subwinTable0, 1, 3) // data column
10511056
CHECK_EQUAL_WAVES(wv, {{2}}, mode = WAVE_DATA)
1052-
WAVE/Z wv = WaveRefIndexed(winBaseTable + "#table0", 2, 3)
1057+
WAVE/Z wv = WaveRefIndexed(subwinTable0, 2, 3)
10531058
CHECK_WAVE(wv, NULL_WAVE)
10541059

10551060
KillWaves/Z waveWithDimlabels
10561061
Make/N=1 waveWithDimlabels = 1
10571062
SetDimLabel ROWS, 0, LABEL, waveWithDimlabels
10581063
string wPath = GetWavesDataFolder(waveWithDimlabels, 2)
10591064
MIES_SF#SF_FormulaPlotter(sweepBrowser, "table(wave(\"" + wPath + "\"))")
1060-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 0, 3) // dimlabel column
1065+
WAVE wv = WaveRefIndexed(subwinTable0, 0, 3) // dimlabel column
10611066
CHECK_EQUAL_WAVES(wv, {{1}}, mode = WAVE_DATA)
1062-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 1, 3) // data column
1067+
WAVE wv = WaveRefIndexed(subwinTable0, 1, 3) // data column
10631068
CHECK_EQUAL_WAVES(wv, {{1}}, mode = WAVE_DATA)
1064-
WAVE/Z wv = WaveRefIndexed(winBaseTable + "#table0", 2, 3) // end of data
1069+
WAVE/Z wv = WaveRefIndexed(subwinTable0, 2, 3) // end of data
10651070
CHECK_WAVE(wv, NULL_WAVE)
10661071

10671072
KillWaves/Z waveWithDimlabels
10681073

10691074
MIES_SF#SF_FormulaPlotter(sweepBrowser, strMixingChain)
10701075
CHECK_EQUAL_VAR(WindowExists(winBaseTable), 1)
1071-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table0"), 1)
1072-
CHECK_EQUAL_VAR(WindowExists(winBaseTable + "#table1"), 0)
1073-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 0, 3) // data column
1076+
CHECK_EQUAL_VAR(WindowExists(subwinTable0), 1)
1077+
CHECK_EQUAL_VAR(WindowExists(subwinTable1), 0)
1078+
WAVE wv = WaveRefIndexed(subwinTable0, 0, 3) // data column
10741079
CHECK_EQUAL_WAVES(wv, {{3}}, mode = WAVE_DATA)
1075-
WAVE wv = WaveRefIndexed(winBaseTable + "#table0", 1, 3) // data column
1080+
WAVE wv = WaveRefIndexed(subwinTable0, 1, 3) // data column
10761081
CHECK_EQUAL_WAVES(wv, {{5}}, mode = WAVE_DATA)
1077-
WAVE/Z wv = WaveRefIndexed(winBaseTable + "#table0", 2, 3)
1082+
WAVE/Z wv = WaveRefIndexed(subwinTable0, 2, 3)
10781083
CHECK_WAVE(wv, NULL_WAVE)
10791084
CHECK_EQUAL_VAR(WindowExists(winBaseGraph), 1)
1080-
CHECK_EQUAL_VAR(WindowExists(winBaseGraph + "#graph0"), 1)
1081-
CHECK_EQUAL_VAR(WindowExists(winBaseGraph + "#graph1"), 0)
1082-
traceName = TraceNameList(winBaseGraph + "#graph0", ";", 1)
1085+
CHECK_EQUAL_VAR(WindowExists(subwinGraph0), 1)
1086+
CHECK_EQUAL_VAR(WindowExists(subwinGraph1), 0)
1087+
traceName = TraceNameList(subwinGraph0, ";", 1)
10831088
traceName = StringFromList(0, traceName)
1084-
tInfo = TraceInfo(winBaseGraph + "#graph0", traceName, 0)
1089+
tInfo = TraceInfo(subwinGraph0, traceName, 0)
10851090
recMacro = tInfo[strsearch(tInfo, ";RECREATION:", 0) + 12, Inf]
10861091
CHECK_GE_VAR(WhichListItem("marker(x)=19", recMacro), 0)
10871092
CHECK_GE_VAR(WhichListItem("mode(x)=3", recMacro), 0)
@@ -2301,7 +2306,7 @@ static Function TestVariablePlottingDifferentSubsequentBaseTypes()
23012306

23022307
win = GetDataBrowserWithData()
23032308
graphBase = BSP_GetFormulaGraph(win)
2304-
graph = graphBase + "_graph#graph" + "0"
2309+
graph = graphBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
23052310

23062311
ExecuteSweepFormulaCode(win, code)
23072312
REQUIRE_EQUAL_VAR(WindowExists(graph), 1)
@@ -2334,13 +2339,14 @@ static Function TestVariableReadOnly()
23342339

23352340
win = GetDataBrowserWithData()
23362341
graphBase = BSP_GetFormulaGraph(win)
2337-
graph = graphBase + "_#graph" + "0"
2342+
graph = graphBase + "_" + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
23382343

23392344
KillWaves/Z root:testData
23402345
Make/N=100 root:testData = p + offset
23412346

23422347
code = "data=wave(root:testData)\rpowerspectrum($data)"
23432348
ExecuteSweepFormulaCode(win, code)
2349+
REQUIRE_EQUAL_VAR(WindowExists(graph), 1)
23442350

23452351
WAVE/WAVE varStorage = GetSFVarStorage(win)
23462352
WAVE/WAVE dataRef = SFH_AttemptDatasetResolve(WaveText(WaveRef(varStorage, row = FindDimLabel(varStorage, ROWS, "data")), row = 0))
@@ -2438,7 +2444,7 @@ static Function TestTraceColors()
24382444
code = "data()"
24392445
winBase = ExecuteSweepFormulaCode(win, code)
24402446

2441-
graph = winBase + "#graph0"
2447+
graph = winBase + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
24422448

24432449
traces = TraceNameList(graph, ";", 1 + 2)
24442450
CHECK_EQUAL_VAR(ItemsInList(traces), 2)
@@ -2450,7 +2456,7 @@ static Function TestTraceColors()
24502456
code = "data(select(selchannels(AD6)))\r with\r data(select(selchannels(AD6)))\r with\r 1"
24512457
winBase = ExecuteSweepFormulaCode(win, code)
24522458

2453-
graph = winBase + "#graph0"
2459+
graph = winBase + "#" + SF_WINNAME_SUFFIX_GRAPH + "0"
24542460

24552461
traces = TraceNameList(graph, ";", 1 + 2)
24562462
CHECK_EQUAL_VAR(ItemsInList(traces), 3)

‎Packages/tests/HardwareBasic/UTF_SweepFormulaHardware.ipf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static Function TestSweepFormulaButtons(string device)
4444

4545
refStr = MIES_SF#SF_GetFormulaWinNameTemplate(graph)
4646
DoWindow/B $refStr
47-
refStr = refStr + "graph#" + "graph0" // graph in panel with counter
47+
refStr = refStr + SF_WINNAME_SUFFIX_GRAPH + "#" + SF_WINNAME_SUFFIX_GRAPH + "0" // graph in panel with counter
4848
PGC_SetAndActivateControl(dbPanel, "button_sweepFormula_tofront")
4949
win = GetCurrentWindow()
5050
CHECK_EQUAL_STR(refStr, win)
@@ -120,8 +120,8 @@ static Function [string dbPanel, string plotWin] GetNewDBforSF_IGNORE()
120120
dbPanel = BSP_GetPanel(graph)
121121
PGC_SetAndActivateControl(dbPanel, "check_BrowserSettings_SF", val = 1)
122122
formulaPanel = MIES_SF#SF_GetFormulaWinNameTemplate(dbPanel)
123-
formulaSubwin = "Graph" + num2istr(0)
124-
return [dbPanel, formulaPanel + "graph#" + formulaSubwin]
123+
formulaSubwin = SF_WINNAME_SUFFIX_GRAPH + num2istr(0)
124+
return [dbPanel, formulaPanel + SF_WINNAME_SUFFIX_GRAPH + "#" + formulaSubwin]
125125
End
126126

127127
static Function TestSweepFormulaAxisLabels(string device)

0 commit comments

Comments
 (0)