Skip to content

PSX multiple selections (only that) #2376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 26, 2025
Merged

PSX multiple selections (only that) #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54178c0
CA_WaveCRCs: Ensure that we got a wave reference wave
t-b Feb 28, 2025
60e68c7
SFH_ParseSweepDataRange: Factor it out
t-b Feb 28, 2025
6127de9
Packages/tests/Basic/Basic.pxp: Cleanup the internal procedure
t-b Feb 28, 2025
251b24c
SFH_GetNumericRangeFromEpochFromSingleSelect: Factor it out
t-b Feb 28, 2025
cfcbe8b
MIES_SweepFormula_PSX.ipf: Resurrect resolved range checking
t-b Feb 28, 2025
870749e
PSX_OperationKernel: Support multiple select statements
t-b Feb 28, 2025
d4a39dd
SFH_CreateSelectDataComp: Factor it out
t-b Feb 28, 2025
5941ef4
PSX_OperationStats: Allow multiple selections
t-b Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Packages/MIES/MIES_Cache.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,8 @@ static Function/S CA_WaveCRCs(WAVE/WAVE waveRefs, [variable crcMode, variable in

variable rows

ASSERT(IsWaveRefWave(waveRefs), "Expected a wave reference wave")

if(ParamIsDefault(crcMode))
crcMode = 0
endif
Expand Down
59 changes: 48 additions & 11 deletions Packages/MIES/MIES_SweepFormula_Helpers.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,8 +1122,8 @@ Function/WAVE SFH_NewSelectDataWave(variable numSweeps, variable numChannels)
return selectData
End

/// @brief Recreate a **single** select data wave and range stored in the JSON wavenote from SFH_GetSweepsForFormula()
Function [WAVE selectData, WAVE range] SFH_ParseToSelectDataWaveAndRange(WAVE sweepData)
/// @brief Parse the range stored in the JSON wavenote from SFH_GetSweepsForFormula()
Function/WAVE SFH_ParseSweepDataRange(WAVE sweepData)

WAVE/Z range = JWN_GetNumericWaveFromWaveNote(sweepData, SF_META_RANGE)

Expand All @@ -1132,6 +1132,18 @@ Function [WAVE selectData, WAVE range] SFH_ParseToSelectDataWaveAndRange(WAVE sw
endif

if(!WaveExists(range) || !HasOneValidEntry(range))
return $""
endif

return range
End

/// @brief Recreate a **single** select data wave and range stored in the JSON wavenote from SFH_GetSweepsForFormula()
Function [WAVE selectData, WAVE range] SFH_ParseToSelectDataWaveAndRange(WAVE sweepData)

WAVE/Z range = SFH_ParseSweepDataRange(sweepData)

if(!WaveExists(range))
return [$"", $""]
endif

Expand Down Expand Up @@ -1478,6 +1490,24 @@ Function/WAVE SFH_GetStimsetRange(string graph, WAVE data, WAVE selectData)
return range
End

Function [WAVE adaptedRange, WAVE/T epochRangeNames] SFH_GetNumericRangeFromEpochFromSingleSelect(string graph, WAVE singleSelectData, WAVE range)

variable sweepNo, chanNr, chanType, mapIndex

sweepNo = singleSelectData[0][%SWEEP]
chanNr = singleSelectData[0][%CHANNELNUMBER]
chanType = singleSelectData[0][%CHANNELTYPE]
mapIndex = singleSelectData[0][%SWEEPMAPINDEX]

WAVE/Z numericalValues = SFH_GetLabNoteBookForSweep(graph, sweepNo, mapIndex, LBN_NUMERICAL_VALUES)
WAVE/Z textualValues = SFH_GetLabNoteBookForSweep(graph, sweepNo, mapIndex, LBN_TEXTUAL_VALUES)
SFH_ASSERT(WaveExists(textualValues) && WaveExists(numericalValues), "LBN not found for sweep " + num2istr(sweepNo))

[WAVE resolvedRanges, WAVE/T epochRangeNames] = SFH_GetNumericRangeFromEpoch(graph, numericalValues, textualValues, range, sweepNo, chanType, chanNr, mapIndex)

return [resolvedRanges, epochRangeNames]
End

/// @brief From a single numeric/textual range wave we return a 2xN numeric range
///
/// Supports numeric ranges, epochs, and epochs with wildcards.
Expand Down Expand Up @@ -1691,27 +1721,34 @@ Function/WAVE SFH_MoveDatasetHigherIfCompatible(WAVE/WAVE data)
return data
End

Function/WAVE SFH_GetSingleSelect(string graph, string opShort, variable sweepNo, variable channelType, variable channelNumber, variable mapIndex)

WAVE/WAVE range = SFH_AsDataSet(SFH_GetFullRange())
WAVE singleSelect = SFH_NewSelectDataWave(1, 1)
singleSelect[0][%SWEEP] = sweepNo
singleSelect[0][%CHANNELTYPE] = channelType
singleSelect[0][%CHANNELNUMBER] = channelNumber
singleSelect[0][%SWEEPMAPINDEX] = mapIndex
Function/WAVE SFH_CreateSelectDataComp(string graph, string opShort, WAVE singleSelect, WAVE range)

WAVE/WAVE selectDataComp = GetSFSelectDataComp(graph, opShort)
JWN_SetStringInWaveNote(selectDataComp, SF_META_DATATYPE, SF_DATATYPE_SELECTCOMP)
JWN_SetStringInWaveNote(singleSelect, SF_META_DATATYPE, SF_DATATYPE_SELECT)
JWN_SetStringInWaveNote(range, SF_META_DATATYPE, SF_DATATYPE_SELECTRANGE)
selectDataComp[%SELECTION] = singleSelect
selectDataComp[%RANGE] = range
selectDataComp[%RANGE] = SFH_AsDataSet(range)

Make/FREE/WAVE selectDataArray = {selectDataComp}

return selectDataArray
End

Function/WAVE SFH_GetSingleSelect(string graph, string opShort, variable sweepNo, variable channelType, variable channelNumber, variable mapIndex)

WAVE range = SFH_GetFullRange()
WAVE singleSelect = SFH_NewSelectDataWave(1, 1)
singleSelect[0][%SWEEP] = sweepNo
singleSelect[0][%CHANNELTYPE] = channelType
singleSelect[0][%CHANNELNUMBER] = channelNumber
singleSelect[0][%SWEEPMAPINDEX] = mapIndex

WAVE selectDataArray = SFH_CreateSelectDataComp(graph, opShort, singleSelect, range)

return selectDataArray
End

Function/S SFH_GetStimsetName(WAVE numericalValues, WAVE textualValues, variable sweepNo, variable channelNumber, variable channelType)

variable index
Expand Down
Loading