Propagate changed stimsets better #1908
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@t-b I'm getting: |
Since the introduction of combine epochs for the wavebuilder in 9b80987 (WaveBuilder: Add new epoch type Combine, 2015-11-12) we need to maintain a wave with the shorthand<->full name mapping. This mapping is updated in WB_UpdateEpochCombineList. Now that function was not called when loading stimsets from NWB and not after starting the wavebuilder panel which resulted in errors trying to recreate combine epochs. This is now fixed. In order to make the fix less hacky we also introduced WB_UpdateChangedStimsets which also calls DAP_UpdateDaEphysStimulusSetPopups which needs to be called in the same cases.
t-b
force-pushed
the
bugfix/1908-combine-stimsets
branch
from
d5ae84c to
de23b63
Compare
|
@timjarsky Please try again. I do need a demo if it is still broken. |
|
@t-b after inducing the issue, then trying combine a single stimset, I get: |
|
Bug is present if one stimset is named like the end of another stimset. The function |
|
@timjarsky Please try again. |
Since forever we just gathered the stimset lists for the currently created combine epoch. But we can do it actually more efficient if we store these lists permanently. And by filling epochCombineList on creation initially we also avoid recreation issues where neither a wavebuilder panel was created nor a device locked.
When we don't have any stimsets the for-loop would never finish.
Forgotten in effe355 (MIES_WaveBuilderPanel.ipf: Add GetEpochParameterNames, 2021-05-28).
t-b
force-pushed
the
bugfix/1908-combine-stimsets
branch
from
4b57da8 to
a3ee26b
Compare
|
Tests should be fixed. |
|
Tests are still failing. |
We must not just replace stimset names as two stimsets might have the same ending substring. By just replacing only full words we avoid the issue without having to change what we store in WPT. Bug introduced in the initial version in 9b80987 (WaveBuilder: Add new epoch type Combine, 2015-11-12).
t-b
force-pushed
the
bugfix/1908-combine-stimsets
branch
from
a3ee26b to
ee589bc
Compare
timjarsky
approved these changes
Oct 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since the introduction of combine epochs for the wavebuilder in 9b80987
(WaveBuilder: Add new epoch type Combine, 2015-11-12) we need to maintain
a wave with the shorthand<->full name mapping. This mapping is updated in
WB_UpdateEpochCombineList.
Now that function was not called when loading stimsets from NWB and not
after starting the wavebuilder panel which resulted in errors trying to
recreate combine epochs.
This is now fixed. In order to make the fix less hacky we also introduced
WB_UpdateChangedStimsets which also calls
DAP_UpdateDaEphysStimulusSetPopups which needs to be called in the same
cases.
Close #1907.
@timjarsky The issue is a plain list updating issue. The stimset itself is good.