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

Slider is ready for testing #1836

Merged
merged 16 commits into from May 25, 2018

Conversation

Projects
None yet
2 participants
@peircej
Member

peircej commented May 25, 2018

Still needs documentation though! (The Builder demo give the best example of use)

peircej added some commits May 9, 2018

ENH: Allow shapestim-based stims to have color attrib
This sets both the fill and line if used
ENH: First pass at new simpler rating scale
features:
 - far fewer params
 - Supports vertical and horizontal
 - more efficient rendering (e.g. element array for tickLines)
 - customise attributes (line, marker...) after creation
 - option for us to create some "styles" with customised line/marker objects
 - if user wants keyboard resp they can control self.rating themselves

to do:
 - use precision setting
 - render text labels
ENH: added granularity and text labels to Slider
Labels respect horiz/vert and flip=True/False. They don't know how
to auto-space themselves yet

The granularity appears to work fine
RF: Slider now has a list of tickable entries for style
Which means we no longer need a customize option
FF: the psyexp schema had changed to allow for Slider's styles
We've added list and fixedList data types. For an interpreter these
can be treated identically but for PsychoPy a fixedList means that
we know in advance what entries are allowed (so we can use CheckListBox
to present the options rather than requiring the user to correctly format
plain text).
Merge branch 'slider'
# Conflicts:
#	psychopy/tests/test_app/test_builder/componsTemplate.txt
@codecov-io

This comment has been minimized.

codecov-io commented May 25, 2018

Codecov Report

Merging #1836 into master will decrease coverage by 0.21%.
The diff coverage is 26.51%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1836      +/-   ##
==========================================
- Coverage   46.96%   46.74%   -0.22%     
==========================================
  Files         219      221       +2     
  Lines       33485    33830     +345     
  Branches     5612     5674      +62     
==========================================
+ Hits        15725    15813      +88     
- Misses      16197    16448     +251     
- Partials     1563     1569       +6
Impacted Files Coverage Δ
psychopy/visual/__init__.py 71.42% <ø> (ø) ⬆️
psychopy/experiment/_experiment.py 47.99% <0%> (-0.21%) ⬇️
psychopy/experiment/flow.py 67.81% <100%> (ø) ⬆️
psychopy/experiment/params.py 76% <100%> (+3.27%) ⬆️
psychopy/experiment/components/grating/__init__.py 71.79% <100%> (ø) ⬆️
psychopy/visual/slider.py 16.15% <16.15%> (ø)
psychopy/visual/shape.py 80.17% <20%> (-3.01%) ⬇️
psychopy/app/builder/validators.py 69.3% <33.33%> (-1%) ⬇️
psychopy/app/builder/dialogs/__init__.py 42.55% <44.44%> (+0.03%) ⬆️
psychopy/visual/helpers.py 63.72% <50%> (-0.64%) ⬇️
... and 6 more

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 cf0b64b...ec1508a. Read the comment docs.

@peircej peircej merged commit 3ab9072 into psychopy:master May 25, 2018

1 of 2 checks passed

lgtm analysis: Python Running analyses for revisions
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment