BF: Fix routine clock resetting in JS#6861
Merged
TEParsons merged 2 commits intopsychopy:releasefrom Sep 20, 2024
Merged
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## release #6861 +/- ##
===========================================
- Coverage 49.64% 49.62% -0.02%
===========================================
Files 332 332
Lines 61204 61204
===========================================
- Hits 30383 30371 -12
- Misses 30821 30833 +12
|
This file contains hidden or 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
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.
When using nonslip timing, the nonslip duration was being subtracted from the routineTimer rather than the Clock (in Python these are one and the same, in JS the routineTimer is a CountdownTimer), meaning nonslip Routines were causing the following Routine to be skipped by messing up its timer.
It's also worth noting that
Clock.addin JS works the opposite toClock.addTimein Python - adding time to the clock reduces the value ofgetTime(as it adds the time to_lastResetTime)