Skip to content
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.

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

BF: Set color object contrast on set contrs for ElementArrayStim, fixes #3816 #4196

Merged
merged 4 commits into from
Aug 10, 2021

Conversation

TEParsons
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented Aug 4, 2021

Codecov Report

Merging #4196 (544a768) into release (e2a87c3) will increase coverage by 0.13%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           release    #4196      +/-   ##
===========================================
+ Coverage    35.80%   35.93%   +0.13%     
===========================================
  Files          288      288              
  Lines        56798    56822      +24     
  Branches      9661     9665       +4     
===========================================
+ Hits         20337    20421      +84     
+ Misses       34480    34405      -75     
- Partials      1981     1996      +15     
Impacted Files Coverage Δ
psychopy/colors.py 61.38% <100.00%> (+0.26%) ⬆️
psychopy/visual/elementarray.py 85.13% <100.00%> (+0.13%) ⬆️
psychopy/data/base.py 68.12% <0.00%> (ø)
psychopy/data/experiment.py 83.33% <0.00%> (ø)
psychopy/experiment/flow.py 47.12% <0.00%> (+0.03%) ⬆️
psychopy/experiment/routines/_base.py 80.42% <0.00%> (+0.26%) ⬆️
psychopy/visual/movie3.py 61.71% <0.00%> (+1.48%) ⬆️
psychopy/visual/window.py 61.91% <0.00%> (+2.38%) ⬆️
psychopy/visual/textbox2/textbox2.py 75.17% <0.00%> (+4.13%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e2a87c3...544a768. Read the comment docs.

…ck thrice so it matches rgb and still expand rgb if it's shorter than contrast (matches previous functionality)
@TEParsons
Copy link
Contributor Author

@peircej New commit uses that function now :) I kept the bit about extending rgb though, as that's needed to maintain old functionality. Previously, if the colour was (1, 1, 1) and contrast as an Nx1 array, it would just copy the color loads of times to match the length of the contrast array so they can be broadcast together.

@peircej peircej merged commit 523a1aa into psychopy:release Aug 10, 2021
@TEParsons TEParsons deleted the _arrayContrast branch December 22, 2021 13:24
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.

None yet

2 participants