Commit 1c64d0b5 authored by Thomas Pronk's avatar Thomas Pronk

_

parent da74f539
......@@ -63,6 +63,8 @@ psychoJS.start({
psychoJS.experimentLogger.setLevel(core.Logger.ServerLevel.EXP);
var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
......@@ -82,6 +84,22 @@ function updateInfo() {
return Scheduler.Event.NEXT;
}
var loading_trialClock;
var loading_text;
var webcam_trialClock;
var intro_text;
var mouse;
var intro_calibatrion_trialClock;
var calibration_text;
var mouse_2;
var calibration_trialClock;
var calibration_square;
var mouse_3;
var tracking_trialClock;
var tracking_square;
var globalClock;
var routineTimer;
function experimentInit() {
// Initialize components for Routine "loading_trial"
loading_trialClock = new util.Clock();
......@@ -181,6 +199,10 @@ function experimentInit() {
return Scheduler.Event.NEXT;
}
var t;
var frameN;
var loading_trialComponents;
function loading_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'loading_trial'-------
......@@ -201,6 +223,8 @@ function loading_trialRoutineBegin(snapshot) {
};
}
var continueRoutine;
function loading_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'loading_trial'-------
......@@ -247,6 +271,7 @@ function loading_trialRoutineEachFrame(snapshot) {
};
}
function loading_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'loading_trial'-------
......@@ -262,6 +287,9 @@ function loading_trialRoutineEnd(snapshot) {
};
}
var gotValidClick;
var webcam_trialComponents;
function webcam_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'webcam_trial'-------
......@@ -305,6 +333,9 @@ function webcam_trialRoutineBegin(snapshot) {
};
}
var prevButtonState;
var _mouseButtons;
function webcam_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'webcam_trial'-------
......@@ -369,6 +400,8 @@ function webcam_trialRoutineEachFrame(snapshot) {
};
}
var _mouseXYs;
function webcam_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'webcam_trial'-------
......@@ -392,6 +425,8 @@ function webcam_trialRoutineEnd(snapshot) {
};
}
var intro_calibatrion_trialComponents;
function intro_calibatrion_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'intro_calibatrion_trial'-------
......@@ -415,6 +450,7 @@ function intro_calibatrion_trialRoutineBegin(snapshot) {
};
}
function intro_calibatrion_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'intro_calibatrion_trial'-------
......@@ -479,6 +515,7 @@ function intro_calibatrion_trialRoutineEachFrame(snapshot) {
};
}
function intro_calibatrion_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'intro_calibatrion_trial'-------
......@@ -502,6 +539,9 @@ function intro_calibatrion_trialRoutineEnd(snapshot) {
};
}
var trials;
var currentLoop;
function trialsLoopBegin(trialsLoopScheduler) {
// set up handler to look after randomisation of conditions etc
trials = new TrialHandler({
......@@ -528,12 +568,15 @@ function trialsLoopBegin(trialsLoopScheduler) {
return Scheduler.Event.NEXT;
}
function trialsLoopEnd() {
psychoJS.experiment.removeLoop(trials);
return Scheduler.Event.NEXT;
}
var calibration_trialComponents;
function calibration_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'calibration_trial'-------
......@@ -548,7 +591,7 @@ function calibration_trialRoutineBegin(snapshot) {
calibration_square.setPos([
calibration_x * psychoJS.window.size[0],
calibration_y * psychoJS.window.size[1]
);
]);
// keep track of which components have finished
calibration_trialComponents = [];
calibration_trialComponents.push(calibration_square);
......@@ -563,6 +606,7 @@ function calibration_trialRoutineBegin(snapshot) {
};
}
function calibration_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'calibration_trial'-------
......@@ -654,6 +698,7 @@ function calibration_trialRoutineEachFrame(snapshot) {
};
}
function calibration_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'calibration_trial'-------
......@@ -679,6 +724,8 @@ function calibration_trialRoutineEnd(snapshot) {
};
}
var tracking_trialComponents;
function tracking_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'tracking_trial'-------
......@@ -701,6 +748,7 @@ function tracking_trialRoutineBegin(snapshot) {
};
}
function tracking_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'tracking_trial'-------
......@@ -768,6 +816,7 @@ function tracking_trialRoutineEachFrame(snapshot) {
};
}
function tracking_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'tracking_trial'-------
......@@ -783,6 +832,7 @@ function tracking_trialRoutineEnd(snapshot) {
};
}
function endLoopIteration(scheduler, snapshot) {
// ------Prepare for next entry------
return function () {
......@@ -805,6 +855,7 @@ function endLoopIteration(scheduler, snapshot) {
};
}
function importConditions(currentLoop) {
return function () {
psychoJS.importAttributes(currentLoop.getCurrentTrial());
......@@ -812,6 +863,7 @@ function importConditions(currentLoop) {
};
}
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (psychoJS.experiment.isEntryEmpty()) {
......
......@@ -73,6 +73,8 @@ psychoJS.start({
psychoJS.experimentLogger.setLevel(core.Logger.ServerLevel.EXP);
var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
......@@ -92,6 +94,22 @@ function updateInfo() {
return Scheduler.Event.NEXT;
}
var loading_trialClock;
var loading_text;
var webcam_trialClock;
var intro_text;
var mouse;
var intro_calibatrion_trialClock;
var calibration_text;
var mouse_2;
var calibration_trialClock;
var calibration_square;
var mouse_3;
var tracking_trialClock;
var tracking_square;
var globalClock;
var routineTimer;
function experimentInit() {
// Initialize components for Routine "loading_trial"
loading_trialClock = new util.Clock();
......@@ -191,6 +209,10 @@ function experimentInit() {
return Scheduler.Event.NEXT;
}
var t;
var frameN;
var loading_trialComponents;
function loading_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'loading_trial'-------
......@@ -210,6 +232,8 @@ function loading_trialRoutineBegin(snapshot) {
};
}
var continueRoutine;
function loading_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'loading_trial'-------
......@@ -256,6 +280,7 @@ function loading_trialRoutineEachFrame(snapshot) {
};
}
function loading_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'loading_trial'-------
......@@ -271,6 +296,9 @@ function loading_trialRoutineEnd(snapshot) {
};
}
var gotValidClick;
var webcam_trialComponents;
function webcam_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'webcam_trial'-------
......@@ -313,6 +341,9 @@ function webcam_trialRoutineBegin(snapshot) {
};
}
var prevButtonState;
var _mouseButtons;
function webcam_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'webcam_trial'-------
......@@ -377,6 +408,8 @@ function webcam_trialRoutineEachFrame(snapshot) {
};
}
var _mouseXYs;
function webcam_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'webcam_trial'-------
......@@ -400,6 +433,8 @@ function webcam_trialRoutineEnd(snapshot) {
};
}
var intro_calibatrion_trialComponents;
function intro_calibatrion_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'intro_calibatrion_trial'-------
......@@ -422,6 +457,7 @@ function intro_calibatrion_trialRoutineBegin(snapshot) {
};
}
function intro_calibatrion_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'intro_calibatrion_trial'-------
......@@ -486,6 +522,7 @@ function intro_calibatrion_trialRoutineEachFrame(snapshot) {
};
}
function intro_calibatrion_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'intro_calibatrion_trial'-------
......@@ -509,6 +546,9 @@ function intro_calibatrion_trialRoutineEnd(snapshot) {
};
}
var trials;
var currentLoop;
function trialsLoopBegin(trialsLoopScheduler) {
// set up handler to look after randomisation of conditions etc
trials = new TrialHandler({
......@@ -534,12 +574,15 @@ function trialsLoopBegin(trialsLoopScheduler) {
return Scheduler.Event.NEXT;
}
function trialsLoopEnd() {
psychoJS.experiment.removeLoop(trials);
return Scheduler.Event.NEXT;
}
var calibration_trialComponents;
function calibration_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'calibration_trial'-------
......@@ -554,7 +597,7 @@ function calibration_trialRoutineBegin(snapshot) {
calibration_square.setPos([
calibration_x * psychoJS.window.size[0],
calibration_y * psychoJS.window.size[1]
);
]);
// keep track of which components have finished
calibration_trialComponents = [];
calibration_trialComponents.push(calibration_square);
......@@ -568,6 +611,7 @@ function calibration_trialRoutineBegin(snapshot) {
};
}
function calibration_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'calibration_trial'-------
......@@ -659,6 +703,7 @@ function calibration_trialRoutineEachFrame(snapshot) {
};
}
function calibration_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'calibration_trial'-------
......@@ -684,6 +729,8 @@ function calibration_trialRoutineEnd(snapshot) {
};
}
var tracking_trialComponents;
function tracking_trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'tracking_trial'-------
......@@ -705,6 +752,7 @@ function tracking_trialRoutineBegin(snapshot) {
};
}
function tracking_trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'tracking_trial'-------
......@@ -772,6 +820,7 @@ function tracking_trialRoutineEachFrame(snapshot) {
};
}
function tracking_trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'tracking_trial'-------
......@@ -787,6 +836,7 @@ function tracking_trialRoutineEnd(snapshot) {
};
}
function endLoopIteration(scheduler, snapshot) {
// ------Prepare for next entry------
return function () {
......@@ -809,6 +859,7 @@ function endLoopIteration(scheduler, snapshot) {
};
}
function importConditions(currentLoop) {
return function () {
psychoJS.importAttributes(currentLoop.getCurrentTrial());
......@@ -816,6 +867,7 @@ function importConditions(currentLoop) {
};
}
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (psychoJS.experiment.isEntryEmpty()) {
......
This diff is collapsed.
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