Commit a82e25cd authored by David Bridges's avatar David Bridges

_

parent 6bf0ac3e
<?xml version="1.0" ?>
<PsychoPy2experiment encoding="utf-8" version="3.0.0b8">
<PsychoPy2experiment encoding="utf-8" version="3.0.0b11">
<Settings>
<Param name="Completed URL" updates="None" val="completedURL" valType="str"/>
<Param name="Completion URL" updates="None" val="https://www.pavlovia.org" valType="str"/>
<Param name="Data filename" updates="None" val="u'data/%s_%s_%s' % (expInfo['participant'], expName, expInfo['date'])" valType="code"/>
<Param name="Enable Escape" updates="None" val="True" valType="bool"/>
......@@ -8,6 +9,7 @@
<Param name="Force stereo" updates="None" val="True" valType="bool"/>
<Param name="Full-screen window" updates="None" val="True" valType="bool"/>
<Param name="HTML path" updates="None" val="html" valType="str"/>
<Param name="Incomplete URL" updates="None" val="incompleteURL" valType="str"/>
<Param name="JS libs" updates="None" val="packaged" valType="str"/>
<Param name="Monitor" updates="None" val="testMonitor" valType="str"/>
<Param name="Save csv file" updates="None" val="False" valType="bool"/>
......@@ -89,6 +91,20 @@
<Param name="stopVal" updates="constant" val="" valType="code"/>
<Param name="timeRelativeTo" updates="constant" val="routine" valType="str"/>
</MouseComponent>
<CodeComponent name="code">
<Param name="Begin Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin JS Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin Routine" updates="constant" val="from scipy.misc import imsave" valType="extendedCode"/>
<Param name="Code Type" updates="None" val="Py" valType="str"/>
<Param name="Each Frame" updates="constant" val="x = win.getMovieFrame()&amp;#10;#imsave(str(t)+'.tif', x)&amp;#10;win.saveMovieFrames(str(t)+'.tif')" valType="extendedCode"/>
<Param name="Each JS Frame" updates="constant" val="" valType="extendedCode"/>
<Param name="End Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="End JS Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="End JS Routine" updates="constant" val="" valType="extendedCode"/>
<Param name="End Routine" updates="constant" val="" valType="extendedCode"/>
<Param name="name" updates="None" val="code" valType="code"/>
</CodeComponent>
</Routine>
<Routine name="instruct">
<TextComponent name="instructFirst">
......
This diff is collapsed.
......@@ -139,6 +139,7 @@ function experimentInit() {
win: psychoJS.window,
});
mouse.mouseClock = new util.Clock();
// Initialize components for Routine "explanation"
explanationClock = new util.Clock();
instruct2 = new visual.TextStim({
......@@ -369,6 +370,7 @@ function trialRoutineBegin() {
// setup some python lists for storing info about the mouse
gotValidClick = false; // until a click is received
mouse.mouseClock.reset();
// keep track of which components have finished
trialComponents = [];
trialComponents.push(imageStimulus);
......@@ -428,6 +430,7 @@ function trialRoutineEachFrame() {
}
}
// check if the Routine should terminate
if (!continueRoutine) { // a component has requested a forced-end of Routine
return Scheduler.Event.NEXT;
......@@ -461,6 +464,7 @@ function trialRoutineEnd() {
}
}
// store data for thisExp (ExperimentHandler)
// the Routine "trial" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......
......@@ -132,6 +132,7 @@ function experimentInit() {
win: psychoJS.window,
});
mouse.mouseClock = new util.Clock();
// Initialize components for Routine "explanation"
explanationClock = new util.Clock();
instruct2 = new visual.TextStim({
......@@ -362,6 +363,7 @@ function trialRoutineBegin() {
// setup some python lists for storing info about the mouse
gotValidClick = false; // until a click is received
mouse.mouseClock.reset();
// keep track of which components have finished
trialComponents = [];
trialComponents.push(imageStimulus);
......@@ -421,6 +423,7 @@ function trialRoutineEachFrame() {
}
}
// check if the Routine should terminate
if (!continueRoutine) { // a component has requested a forced-end of Routine
return Scheduler.Event.NEXT;
......@@ -454,6 +457,7 @@ function trialRoutineEnd() {
}
}
// store data for thisExp (ExperimentHandler)
// the Routine "trial" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment