FF: builder component fixes

- all dialogs now working
jeremygray · Jul 21, 2014 · bb64f99 · bb64f99
1 parent 5fba0d1
commit bb64f99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/psychopy/app/builder/components/image.py b/psychopy/app/builder/components/image.py
@@ -44,7 +44,7 @@ def __init__(self, exp, parentName, name='image', image='', mask='None', interpo
             updates='constant', allowedUpdates=[],
             hint=_("Resolution of the mask if one is used."),
             label="Texture resolution", categ="Advanced")
-        self.params['interpolate']=Param(mask, valType='str', allowedVals=['linear','nearest'],
+        self.params['interpolate']=Param(interpolate, valType='str', allowedVals=['linear','nearest'],
             updates='constant', allowedUpdates=[],
             hint=_("How should the image be interpolated if/when rescaled"),
             label="Interpolate", categ="Advanced")

diff --git a/psychopy/app/builder/components/parallelOut.py b/psychopy/app/builder/components/parallelOut.py
@@ -49,6 +49,8 @@ def __init__(self, exp, parentName, name='p_port',
             hint=_("(Optional) expected duration (s), purely for representing in the timeline"))
         #main parameters
         addressOptions = prefs.general['parallelPorts']
+        if not address:
+            address = addressOptions[0]
         self.params['address'] = Param(address, valType='str', allowedVals=addressOptions,
             hint=_("Parallel port to be used (you can change these options in preferences>general)"))
         self.params['startData'] = Param(startData, valType='code', allowedTypes=[],