Skip to content

Commit

Permalink
TEST: check component param values and options against a reference file
Browse files Browse the repository at this point in the history
- extract and print param fields, not just default val (much more detailed)
- handle multi-line values more carefully
- still is a manual test but could include in tests/test_app with minor changes
- fix component param settings to ensure values match upstream/master
  • Loading branch information
jeremygray committed Jul 19, 2014
1 parent 22b5c6c commit b30f022
Show file tree
Hide file tree
Showing 5 changed files with 2,331 additions and 311 deletions.
1 change: 1 addition & 0 deletions psychopy/app/builder/components/ioLabs.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def __init__(self, exp, parentName, name='bbox',
'lights', 'store', 'storeCorrect', 'correctAns']

self.params['correctAns'].hint = _("What is the 'correct' response? NB, keys are labelled 0 to 7 on a 8-button box")
self.params['store'].allowedVals = ['last button', 'first button', 'all buttons', 'nothing']
self.params['active'] = Param(active, valType='code', allowedTypes=[],
updates='constant', allowedUpdates=['constant','set every repeat'],
hint=_("Active buttons, such as '1,6', '(1,2,5,6)' or '0' (without quotes)"),
Expand Down
1 change: 1 addition & 0 deletions psychopy/app/builder/components/microphone.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def __init__(self, exp, parentName, name='mic_1',
self.params['stereo']=Param(stereo, valType='bool',
hint=_("Record two channels (stereo) or one (mono, smaller file)"),
label=_localized['stereo'])
self.params['stopType'].allowedVals = ['duration (s)']
def writeStartCode(self,buff):
# filename should have date_time, so filename_wav should be unique
buff.writeIndented("wavDirName = filename + '_wav'\n")
Expand Down
2 changes: 1 addition & 1 deletion psychopy/app/builder/components/patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
class PatchComponent(VisualComponent):
"""An event class for presenting image-based stimuli"""
def __init__(self, exp, parentName, name='patch', image='sin', mask='None', sf='None', interpolate='linear',
def __init__(self, exp, parentName, name='patch', image='sin', mask='None', sf='None', interpolate='None', #'linear',
units='from exp settings', color='$[1,1,1]', colorSpace='rgb',
pos=[0,0], size=[0.5,0.5], ori=0, phase=0.0, texRes='128',
startType='time (s)', startVal=0.0,
Expand Down

0 comments on commit b30f022

Please sign in to comment.