Merge branch 'image-issue'

backend/general_grasp_training.psyexp

@@ -319,8 +319,8 @@
         <Param val="" valType="code" updates="None" name="durationEstim"/>
         <Param val="False" valType="bool" updates="constant" name="flipHoriz"/>
         <Param val="False" valType="bool" updates="constant" name="flipVert"/>
-        <Param val="static/images/rest.jpg" valType="file" updates="constant" name="image"/>
-        <Param val="nearest" valType="str" updates="constant" name="interpolate"/>
+        <Param val="static/images/rest.png" valType="file" updates="constant" name="image"/>
+        <Param val="linear" valType="str" updates="constant" name="interpolate"/>
         <Param val="" valType="str" updates="constant" name="mask"/>
         <Param val="img_rest" valType="code" updates="None" name="name"/>
         <Param val="" valType="num" updates="constant" name="opacity"/>
@@ -422,8 +422,8 @@
         <Param val="" valType="code" updates="None" name="durationEstim"/>
         <Param val="False" valType="bool" updates="constant" name="flipHoriz"/>
         <Param val="False" valType="bool" updates="constant" name="flipVert"/>
-        <Param val="static/images/hand_move.jpg" valType="file" updates="constant" name="image"/>
-        <Param val="nearest" valType="str" updates="constant" name="interpolate"/>
+        <Param val="static/images/hand_move.png" valType="file" updates="constant" name="image"/>
+        <Param val="linear" valType="str" updates="constant" name="interpolate"/>
         <Param val="" valType="str" updates="constant" name="mask"/>
         <Param val="img_right" valType="code" updates="None" name="name"/>
         <Param val="" valType="num" updates="constant" name="opacity"/>

backend/general_grasp_training.py

@@ -427,11 +427,11 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
     img_right = visual.ImageStim(
         win=win,
         name='img_right', 
-        image='static/images/hand_move.jpg', mask=None, anchor='center',
+        image='static/images/hand_move.png', mask=None, anchor='center',
         ori=0.0, pos=(0, 0), size=None,
         color=[1,1,1], colorSpace='rgb', opacity=None,
         flipHoriz=False, flipVert=False,
-        texRes=128.0, interpolate=False, depth=0.0)
+        texRes=128.0, interpolate=True, depth=0.0)
     
     # --- Initialize components for Routine "decision" ---
     
@@ -457,11 +457,11 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
     img_rest = visual.ImageStim(
         win=win,
         name='img_rest', 
-        image='static/images/rest.jpg', mask=None, anchor='center',
+        image='static/images/rest.png', mask=None, anchor='center',
         ori=0.0, pos=(0, 0), size=None,
         color=[1,1,1], colorSpace='rgb', opacity=None,
         flipHoriz=False, flipVert=False,
-        texRes=128.0, interpolate=False, depth=0.0)
+        texRes=128.0, interpolate=True, depth=0.0)
     
     # --- Initialize components for Routine "end" ---
     mi_end = visual.TextStim(win=win, name='mi_end',