Skip to content

BF: Fix routine clock resetting in JS#6861

Merged
TEParsons merged 2 commits intopsychopy:releasefrom
TEParsons:release-bf-js-nonslip-cherry
Sep 20, 2024
Merged

BF: Fix routine clock resetting in JS#6861
TEParsons merged 2 commits intopsychopy:releasefrom
TEParsons:release-bf-js-nonslip-cherry

Conversation

@TEParsons
Copy link
Contributor

@TEParsons TEParsons commented Sep 18, 2024

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.add in JS works the opposite to Clock.addTime in Python - adding time to the clock reduces the value of getTime (as it adds the time to _lastResetTime)

@codecov
Copy link

codecov bot commented Sep 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.62%. Comparing base (eb5e61b) to head (3c6dbd9).
Report is 8 commits behind head on release.

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     
Components Coverage Δ
app ∅ <ø> (∅)
boilerplate ∅ <ø> (∅)
library ∅ <ø> (∅)
vm-safe library ∅ <ø> (∅)

@TEParsons TEParsons merged commit ad2a1df into psychopy:release Sep 20, 2024
@TEParsons TEParsons deleted the release-bf-js-nonslip-cherry branch October 4, 2024 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant