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

NF: Adds Slider for JS, and other amendments #2185

Merged
merged 10 commits into from Jan 11, 2019

Conversation

Projects
None yet
4 participants
@dvbridges
Copy link
Contributor

dvbridges commented Jan 4, 2019

Adds Slider code for JS
baseComponent now uses py2js to convert tuples to list
Adds new compile command for JS setFillColor
Updates version in settings.init
Other JS code compile amendments

Awaiting confirmation that server is running to test Slider online

dvbridges added some commits Dec 10, 2018

ENH: Further additions to Slider
Adds radio to Slider Builder Component
Removes default radio color as it overrides styles
Adds labelHeight param to Slider, to change label size
ENH: Adds Slider for JS, and other amendments
Adds Slider code for JS
baseComponent now uses py2js to convert tuples to list
Adds new compile command for JS setFillColor
Updates version in settings.init
Other JS code compile amendments

Awaiting confirmation that server is running to test Slider online
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 4, 2019

Codecov Report

Merging #2185 into master will decrease coverage by 0.03%.
The diff coverage is 27.5%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2185      +/-   ##
==========================================
- Coverage   42.92%   42.88%   -0.04%     
==========================================
  Files         221      221              
  Lines       38115    38196      +81     
  Branches     6548     6563      +15     
==========================================
+ Hits        16361    16382      +21     
- Misses      20201    20254      +53     
- Partials     1553     1560       +7
Impacted Files Coverage Δ
psychopy/experiment/components/polygon/__init__.py 57.35% <ø> (ø) ⬆️
...sychopy/experiment/components/settings/__init__.py 72.33% <ø> (ø) ⬆️
psychopy/experiment/routine.py 81.46% <ø> (ø) ⬆️
psychopy/experiment/components/_base.py 55.75% <0%> (-0.61%) ⬇️
psychopy/visual/slider.py 74.02% <100%> (-0.1%) ⬇️
...sychopy/experiment/components/keyboard/__init__.py 46.63% <100%> (ø) ⬆️
psychopy/experiment/components/__init__.py 55.55% <100%> (ø) ⬆️
psychopy/experiment/components/slider/__init__.py 42.26% <18.75%> (-11.58%) ⬇️
psychopy/experiment/components/movie/__init__.py 30.69% <0%> (-10.49%) ⬇️
psychopy/preferences/preferences.py 57.79% <0%> (-2.78%) ⬇️
... and 8 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 b75b813...cf96eae. Read the comment docs.

@coveralls

This comment has been minimized.

Copy link

coveralls commented Jan 4, 2019

Coverage Status

Coverage decreased (-0.2%) to 46.842% when pulling 9c01362 on dvbridges:jsSlider into b75b813 on psychopy:master.

@coveralls

This comment has been minimized.

Copy link

coveralls commented Jan 4, 2019

Coverage Status

Coverage decreased (-0.02%) to 46.977% when pulling cf96eae on dvbridges:jsSlider into b75b813 on psychopy:master.

@dvbridges dvbridges changed the title ENH: Adds Slider for JS, and other amendments NF: Adds Slider for JS, and other amendments Jan 4, 2019

@peircej

This comment has been minimized.

Copy link
Member

peircej commented Jan 4, 2019

This pull request introduces 2 alerts when merging 9c01362 into b75b813 - view on LGTM.com

new alerts:

  • 2 for Unused local variable

Comment posted by LGTM.com

dvbridges added some commits Jan 4, 2019

BF: Uses PsychoPy version to format PsychJS import statements
Req made in this branch, as change to version already made using this branch, but change was specific to '3.0.0'.
Note, this will fail if user attempts to export HTML if using PsychoPY version < 3.0.0 (i.e., they used useVersion function/changed version in Experiment Settings). That should be ok though, considering they should not be using those versions for exporting HTML. Being able to select version 3.0.0 in the toolbar has been addressed in pull request #2180.

@peircej peircej merged commit f74c578 into psychopy:master Jan 11, 2019

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