Skip to content

Commit 67de3ad

Browse files
Copilott-b
andcommitted
Add 64-bit integer waves (signed and unsigned) to GetEmptyWavesOfAllTypes
Co-authored-by: t-b <[email protected]>
1 parent bde4975 commit 67de3ad

File tree

1 file changed

+31
-23
lines changed

1 file changed

+31
-23
lines changed

Packages/tests/UTF_DataGenerators.ipf

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,7 +2000,7 @@ End
20002000
/// This is used for testing IsXXXWave functions with actual wave references
20012001
static Function/WAVE GetEmptyWavesOfAllTypes()
20022002

2003-
Make/FREE/WAVE/N=13 waveRefs
2003+
Make/FREE/WAVE/N=15 waveRefs
20042004

20052005
// Numeric wave types
20062006
Make/FREE/D wvDouble
@@ -2011,53 +2011,61 @@ static Function/WAVE GetEmptyWavesOfAllTypes()
20112011
waveRefs[1] = wvSingle
20122012
SetDimLabel ROWS, 1, NT_FP32, waveRefs
20132013

2014+
Make/FREE/L wvInt64
2015+
waveRefs[2] = wvInt64
2016+
SetDimLabel ROWS, 2, NT_I64, waveRefs
2017+
20142018
Make/FREE/I wvInt32
2015-
waveRefs[2] = wvInt32
2016-
SetDimLabel ROWS, 2, NT_I32, waveRefs
2019+
waveRefs[3] = wvInt32
2020+
SetDimLabel ROWS, 3, NT_I32, waveRefs
20172021

20182022
Make/FREE/W wvInt16
2019-
waveRefs[3] = wvInt16
2020-
SetDimLabel ROWS, 3, NT_I16, waveRefs
2023+
waveRefs[4] = wvInt16
2024+
SetDimLabel ROWS, 4, NT_I16, waveRefs
20212025

20222026
Make/FREE/B wvInt8
2023-
waveRefs[4] = wvInt8
2024-
SetDimLabel ROWS, 4, NT_I8, waveRefs
2027+
waveRefs[5] = wvInt8
2028+
SetDimLabel ROWS, 5, NT_I8, waveRefs
2029+
2030+
Make/FREE/L/U wvUInt64
2031+
waveRefs[6] = wvUInt64
2032+
SetDimLabel ROWS, 6, $"NT_I64 | NT_UNSIGNED", waveRefs
20252033

20262034
Make/FREE/I/U wvUInt32
2027-
waveRefs[5] = wvUInt32
2028-
SetDimLabel ROWS, 5, $"NT_I32 | NT_UNSIGNED", waveRefs
2035+
waveRefs[7] = wvUInt32
2036+
SetDimLabel ROWS, 7, $"NT_I32 | NT_UNSIGNED", waveRefs
20292037

20302038
Make/FREE/W/U wvUInt16
2031-
waveRefs[6] = wvUInt16
2032-
SetDimLabel ROWS, 6, $"NT_I16 | NT_UNSIGNED", waveRefs
2039+
waveRefs[8] = wvUInt16
2040+
SetDimLabel ROWS, 8, $"NT_I16 | NT_UNSIGNED", waveRefs
20332041

20342042
Make/FREE/B/U wvUInt8
2035-
waveRefs[7] = wvUInt8
2036-
SetDimLabel ROWS, 7, $"NT_I8 | NT_UNSIGNED", waveRefs
2043+
waveRefs[9] = wvUInt8
2044+
SetDimLabel ROWS, 9, $"NT_I8 | NT_UNSIGNED", waveRefs
20372045

20382046
// Special wave types
20392047
Make/FREE/T wvText
2040-
waveRefs[8] = wvText
2041-
SetDimLabel ROWS, 8, TEXT_WAVE, waveRefs
2048+
waveRefs[10] = wvText
2049+
SetDimLabel ROWS, 10, TEXT_WAVE, waveRefs
20422050

20432051
Make/FREE/WAVE wvWave
2044-
waveRefs[9] = wvWave
2045-
SetDimLabel ROWS, 9, WAVE_WAVE, waveRefs
2052+
waveRefs[11] = wvWave
2053+
SetDimLabel ROWS, 11, WAVE_WAVE, waveRefs
20462054

20472055
// Datafolder reference wave
20482056
Make/FREE/DF wvDFRef
2049-
waveRefs[10] = wvDFRef
2050-
SetDimLabel ROWS, 10, DFREF_WAVE, waveRefs
2057+
waveRefs[12] = wvDFRef
2058+
SetDimLabel ROWS, 12, DFREF_WAVE, waveRefs
20512059

20522060
// Complex waves (double precision complex)
20532061
Make/FREE/D/C wvComplexDouble
2054-
waveRefs[11] = wvComplexDouble
2055-
SetDimLabel ROWS, 11, $"NT_FP64 | NT_COMPLEX", waveRefs
2062+
waveRefs[13] = wvComplexDouble
2063+
SetDimLabel ROWS, 13, $"NT_FP64 | NT_COMPLEX", waveRefs
20562064

20572065
// Complex waves (single precision complex)
20582066
Make/FREE/R/C wvComplexSingle
2059-
waveRefs[12] = wvComplexSingle
2060-
SetDimLabel ROWS, 12, $"NT_FP32 | NT_COMPLEX", waveRefs
2067+
waveRefs[14] = wvComplexSingle
2068+
SetDimLabel ROWS, 14, $"NT_FP32 | NT_COMPLEX", waveRefs
20612069

20622070
return waveRefs
20632071
End

0 commit comments

Comments
 (0)