mirror of
https://github.com/jspsych/jsPsych.git
synced 2025-05-10 11:10:54 +00:00
missed the animation and touch plugins in previous changes.
similarity had a bug in the naming of the plugin.
This commit is contained in:
Josh de Leeuw
parent
9c94b4d0b6
commit
a056b6e69c
@ -1,58 +1,66 @@
|
||||
// jsPsych plugin for showing animations
|
||||
// Josh de Leeuw
|
||||
|
||||
function animation_create(params)
|
||||
{
|
||||
stims = params["stimuli"];
|
||||
trials = new Array(stims.length);
|
||||
for(var i = 0; i < trials.length; i++)
|
||||
{
|
||||
trials[i] = {};
|
||||
trials[i]["type"] = "animate";
|
||||
trials[i]["stims"] = stims[i];
|
||||
trials[i]["frame_time"] = params["frame_time"];
|
||||
trials[i]["repetitions"] = params["repetitions"];
|
||||
trials[i]["timing"] = params["timing"];
|
||||
if(params["prompt"] != undefined){
|
||||
trials[i]["prompt"] = params["prompt"][i];
|
||||
(function( $ ) {
|
||||
$.fn.jsPsych.animation = (function(){
|
||||
|
||||
var plugin = {};
|
||||
|
||||
plugin.create = function(params) {
|
||||
stims = params["stimuli"];
|
||||
trials = new Array(stims.length);
|
||||
for(var i = 0; i < trials.length; i++)
|
||||
{
|
||||
trials[i] = {};
|
||||
trials[i]["type"] = "animate";
|
||||
trials[i]["stims"] = stims[i];
|
||||
trials[i]["frame_time"] = params["frame_time"];
|
||||
trials[i]["repetitions"] = params["repetitions"];
|
||||
trials[i]["timing"] = params["timing"];
|
||||
if(params["prompt"] != undefined){
|
||||
trials[i]["prompt"] = params["prompt"][i];
|
||||
}
|
||||
}
|
||||
return trials;
|
||||
}
|
||||
}
|
||||
return trials;
|
||||
}
|
||||
|
||||
function animation_trial($this, block, trial, part)
|
||||
{
|
||||
var animate_frame = -1;
|
||||
var reps = 0;
|
||||
switch(part)
|
||||
{
|
||||
case 1:
|
||||
animate_interval = setInterval(function(){
|
||||
showImage = true;
|
||||
$this.html(""); // clear everything
|
||||
animate_frame++;
|
||||
if(animate_frame == trial.stims.length)
|
||||
{
|
||||
animate_frame = 0;
|
||||
reps++;
|
||||
if(reps >= trial.repetitions)
|
||||
{
|
||||
animation_trial($this, block, trial, part + 1);
|
||||
clearInterval(animate_interval);
|
||||
showImage = false;
|
||||
}
|
||||
}
|
||||
if(showImage){
|
||||
$this.append($('<img>', {
|
||||
"src": trial.stims[animate_frame],
|
||||
"class": 'animate'
|
||||
}));
|
||||
if(trial.prompt != undefined) { $this.append(trial.prompt); }
|
||||
}
|
||||
}, trial.frame_time);
|
||||
break;
|
||||
case 2:
|
||||
setTimeout(function(){ block.next(); }, trial.timing[0]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
plugin.trial = function($this, block, trial, part)
|
||||
{
|
||||
var animate_frame = -1;
|
||||
var reps = 0;
|
||||
switch(part)
|
||||
{
|
||||
case 1:
|
||||
animate_interval = setInterval(function(){
|
||||
showImage = true;
|
||||
$this.html(""); // clear everything
|
||||
animate_frame++;
|
||||
if(animate_frame == trial.stims.length)
|
||||
{
|
||||
animate_frame = 0;
|
||||
reps++;
|
||||
if(reps >= trial.repetitions)
|
||||
{
|
||||
animation_trial($this, block, trial, part + 1);
|
||||
clearInterval(animate_interval);
|
||||
showImage = false;
|
||||
}
|
||||
}
|
||||
if(showImage){
|
||||
$this.append($('<img>', {
|
||||
"src": trial.stims[animate_frame],
|
||||
"class": 'animate'
|
||||
}));
|
||||
if(trial.prompt != undefined) { $this.append(trial.prompt); }
|
||||
}
|
||||
}, trial.frame_time);
|
||||
break;
|
||||
case 2:
|
||||
setTimeout(function(){ block.next(); }, trial.timing[0]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return plugin;
|
||||
})();
|
||||
})(jQuery);
|
||||
@ -1,5 +1,5 @@
|
||||
(function( $ ) {
|
||||
$.fn.jsPsych.text = (function(){
|
||||
$.fn.jsPsych.similarity = (function(){
|
||||
|
||||
var plugin = {};
|
||||
|
||||
|
||||
@ -1,85 +1,96 @@
|
||||
function xab_touch_create(params)
|
||||
{
|
||||
//xab_stims = shuffle(xab_stims);
|
||||
xab_stims = params["stimuli"];
|
||||
trials = new Array(xab_stims.length);
|
||||
for(var i = 0; i < trials.length; i++)
|
||||
{
|
||||
trials[i] = {};
|
||||
trials[i]["type"] = "xab_touch";
|
||||
trials[i]["a_path"] = xab_stims[i][0];
|
||||
trials[i]["b_path"] = xab_stims[i][1];
|
||||
trials[i]["timing"] = params["timing"];
|
||||
if(params["data"]!=undefined){
|
||||
trials[i]["data"] = params["data"][i];
|
||||
}
|
||||
}
|
||||
return trials;
|
||||
}
|
||||
|
||||
function xab_touch_trial($this, block, trial, part)
|
||||
{
|
||||
switch(part){
|
||||
case 1:
|
||||
p1_time = (new Date()).getTime();
|
||||
$.fn.jsPsych.showImage($this, trial.a_path, 'xab_touch');
|
||||
setTimeout(xab_touch_trial, trial.timing[0], $this, block, trial, part + 1);
|
||||
break;
|
||||
case 2:
|
||||
p2_time = (new Date()).getTime();
|
||||
$('.xab_touch').remove();
|
||||
setTimeout(xab_touch_trial, trial.timing[1], $this, block, trial, part + 1);
|
||||
break;
|
||||
case 3:
|
||||
p3_time = (new Date()).getTime();
|
||||
startTime = (new Date()).getTime();
|
||||
var images = [trial.a_path, trial.b_path];
|
||||
var target_left = (Math.floor(Math.random()*2)==0); // binary true/false choice
|
||||
if(!target_left){
|
||||
images = [trial.b_path, trial.a_path];
|
||||
(function( $ ) {
|
||||
$.fn.jsPsych.xab-touch = (function(){
|
||||
|
||||
var plugin = {};
|
||||
|
||||
plugin.create = function(params) {
|
||||
//xab_stims = shuffle(xab_stims);
|
||||
xab_stims = params["stimuli"];
|
||||
trials = new Array(xab_stims.length);
|
||||
for(var i = 0; i < trials.length; i++)
|
||||
{
|
||||
trials[i] = {};
|
||||
trials[i]["type"] = "xab_touch";
|
||||
trials[i]["a_path"] = xab_stims[i][0];
|
||||
trials[i]["b_path"] = xab_stims[i][1];
|
||||
trials[i]["timing"] = params["timing"];
|
||||
if(params["data"]!=undefined){
|
||||
trials[i]["data"] = params["data"][i];
|
||||
}
|
||||
}
|
||||
//$.fn.jsPsych.showImages($this, images, 'xab');
|
||||
|
||||
var correct=false;
|
||||
|
||||
var left_img = document.createElement('img');
|
||||
left_img.setAttribute('src', images[0]);
|
||||
left_img.setAttribute('class', 'xab_touch');
|
||||
left_img.setAttribute('id','left_img');
|
||||
$this.append(left_img);
|
||||
$("#left_img").click(function() {
|
||||
if(target_left) { correct = true; }
|
||||
|
||||
endTime = (new Date()).getTime();
|
||||
rt = (endTime-startTime);
|
||||
stim1_time = (p2_time-p1_time);
|
||||
isi_time = (p3_time-p2_time);
|
||||
var trial_data = {"rt": rt, "correct": correct, "a_path": trial.a_path, "b_path": trial.b_path, "stim1_time": stim1_time, "isi_time":isi_time}
|
||||
block.data[block.trial_idx] = $.extend({},trial_data,trial.data);
|
||||
$('.xab_touch').remove();
|
||||
setTimeout(function(b){b.next();}, trial.timing[2], block);
|
||||
});
|
||||
|
||||
var right_img = document.createElement('img');
|
||||
right_img.setAttribute('src', images[1]);
|
||||
right_img.setAttribute('class', 'xab_touch');
|
||||
right_img.setAttribute('id','right_img');
|
||||
$this.append(right_img);
|
||||
$("#right_img").click(function() {
|
||||
if(!target_left) { correct = true; }
|
||||
|
||||
endTime = (new Date()).getTime();
|
||||
rt = (endTime-startTime);
|
||||
stim1_time = (p2_time-p1_time);
|
||||
isi_time = (p3_time-p2_time);
|
||||
var trial_data = {"rt": rt, "correct": correct, "a_path": trial.a_path, "b_path": trial.b_path, "stim1_time": stim1_time, "isi_time":isi_time}
|
||||
block.data[block.trial_idx] = $.extend({},trial_data,trial.data);
|
||||
$('.xab_touch').remove();
|
||||
setTimeout(function(b){b.next();}, trial.timing[2], block);
|
||||
});
|
||||
|
||||
//TODO: CHECK IF IMAGE SHOULD DISAPPEAR
|
||||
//based on timings
|
||||
break;
|
||||
}
|
||||
}
|
||||
return trials;
|
||||
}
|
||||
|
||||
plugin.trial = function($this, block, trial, part)
|
||||
{
|
||||
switch(part){
|
||||
case 1:
|
||||
p1_time = (new Date()).getTime();
|
||||
$this.append($('<img>', {
|
||||
"src": trial.a_path,
|
||||
"class": 'xab_touch'
|
||||
}));
|
||||
setTimeout(function(){xab_touch_trial($this, block, trial, part + 1);}, trial.timing[0]);
|
||||
break;
|
||||
case 2:
|
||||
p2_time = (new Date()).getTime();
|
||||
$('.xab_touch').remove();
|
||||
setTimeout(function(){xab_touch_trial($this, block, trial, part + 1);}, trial.timing[1]);
|
||||
break;
|
||||
case 3:
|
||||
p3_time = (new Date()).getTime();
|
||||
startTime = (new Date()).getTime();
|
||||
var images = [trial.a_path, trial.b_path];
|
||||
var target_left = (Math.floor(Math.random()*2)==0); // binary true/false choice
|
||||
if(!target_left){
|
||||
images = [trial.b_path, trial.a_path];
|
||||
}
|
||||
//$.fn.jsPsych.showImages($this, images, 'xab');
|
||||
|
||||
var correct=false;
|
||||
|
||||
$this.append($('<img>', {
|
||||
"src": images[0],
|
||||
"class": 'xab_touch',
|
||||
"id": "left_img"
|
||||
}));
|
||||
$("#left_img").click(function() {
|
||||
if(target_left) { correct = true; }
|
||||
|
||||
endTime = (new Date()).getTime();
|
||||
rt = (endTime-startTime);
|
||||
stim1_time = (p2_time-p1_time);
|
||||
isi_time = (p3_time-p2_time);
|
||||
var trial_data = {"rt": rt, "correct": correct, "a_path": trial.a_path, "b_path": trial.b_path, "stim1_time": stim1_time, "isi_time":isi_time}
|
||||
block.data[block.trial_idx] = $.extend({},trial_data,trial.data);
|
||||
$('.xab_touch').remove();
|
||||
setTimeout(function(){block.next();}, trial.timing[2]);
|
||||
});
|
||||
|
||||
$this.append($('<img>', {
|
||||
"src": images[1],
|
||||
"class": 'xab_touch',
|
||||
"id": "right_img"
|
||||
}));
|
||||
$("#right_img").click(function() {
|
||||
if(!target_left) { correct = true; }
|
||||
|
||||
endTime = (new Date()).getTime();
|
||||
rt = (endTime-startTime);
|
||||
stim1_time = (p2_time-p1_time);
|
||||
isi_time = (p3_time-p2_time);
|
||||
var trial_data = {"rt": rt, "correct": correct, "a_path": trial.a_path, "b_path": trial.b_path, "stim1_time": stim1_time, "isi_time":isi_time}
|
||||
block.data[block.trial_idx] = $.extend({},trial_data,trial.data);
|
||||
$('.xab_touch').remove();
|
||||
setTimeout(function(){block.next();}, trial.timing[2]);
|
||||
});
|
||||
|
||||
//TODO: CHECK IF IMAGE SHOULD DISAPPEAR
|
||||
//based on timings
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return plugin;
|
||||
})();
|
||||
})(jQuery);
|
||||
Loading…
Reference in New Issue
Block a user