HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-10 19:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add on_data_update callback function to core

Browse Source
This commit is contained in:
Josh de Leeuw 2013-10-21 18:00:13 -04:00
parent 43a76df8e3
commit c33eec8724
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
jspsych.js
View File

@ -34,13 +34,13 @@
// //
// core.init creates the experiment and starts running it // core.init creates the experiment and starts running it
// $this is an HTML element (usually a <div>) that will display jsPsych content // display_element is an HTML element (usually a <div>) that will display jsPsych content
// options is an object: { // options is an object: {
// "experiment_structure": an array of blocks specifying the experiment // "experiment_structure": an array of blocks specifying the experiment
// "finish": function to execute when the experiment ends // "finish": function to execute when the experiment ends
// } // }
// //
core.init = function($this, options){ core.init = function(display_element, options){
// reset the key variables // reset the key variables
// TODO: properly define this as a class with instance variables? // TODO: properly define this as a class with instance variables?
@ -52,18 +52,19 @@
var defaults = { var defaults = {
'on_trial_start': function(){ return undefined; }, 'on_trial_start': function(){ return undefined; },
'on_trial_finish': function() { return undefined; } 'on_trial_finish': function() { return undefined; },
} 'on_data_update' : function(data) { return undefined; }
};
// import options // import options
opts = $.extend({}, defaults, options); opts = $.extend({}, defaults, options);
// set target // set target
DOM_target = $this; DOM_target = display_element;
run(); run();
} };
// core.data returns all of the data objects for each block as an array // core.data returns all of the data objects for each block as an array
// where core.data[0] = data object from block 0, etc... // where core.data[0] = data object from block 0, etc...
core.data = function(){ core.data = function(){
var all_data = []; var all_data = [];
@ -72,7 +73,7 @@
all_data[i] = exp_blocks[i].data; all_data[i] = exp_blocks[i].data;
} }
return all_data; return all_data;
} };
// core.progress returns an object with the following properties // core.progress returns an object with the following properties
// total_blocks: the number of total blocks in the experiment // total_blocks: the number of total blocks in the experiment
@ -124,10 +125,11 @@
exp_blocks[i] = createBlock(trials); exp_blocks[i] = createBlock(trials);
} }
// start!
// record the start time
exp_start_time = new Date(); exp_start_time = new Date();
// run the first block // begin! - run the first block
exp_blocks[0].next(); exp_blocks[0].next();
} }
@ -172,6 +174,11 @@
do_trial(this, curr_trial); do_trial(this, curr_trial);
}, },
writeData: function(data_object) {
this.data[this.trial_idx] = data_object;
opts.on_data_update(data_object);
},
done: nextBlock, done: nextBlock,
num_trials: trial_list.length num_trials: trial_list.length