Skip to content

S
Scroll Text
Commit 088dd430 authored by Wakefield Morys-Carter's avatar Wakefield Morys-Carter
Browse files
Options

maxScroll = round(maxScroll*.02 / fontSize)-1;

parent e86ecc04
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 3 deletions
scroll-text-legacy-browsers.js
View file @ 088dd430
......@@ -56,6 +56,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;
......@@ -75,6 +77,27 @@ function updateInfo() {
return Scheduler.Event.NEXT;
}
var startClock;
var thisExp;
var win;
var event;
var mouse;
var trialClock;
var screenRatio;
var fontSize;
var mouseY;
var trackLength;
var trackWidth;
var scrollText;
var scrollBar;
var scrollButton;
var bottomCrop;
var continueText;
var endClock;
var text;
var globalClock;
var routineTimer;
function experimentInit() {
// Initialize components for Routine "start"
startClock = new util.Clock();
......@@ -169,6 +192,12 @@ function experimentInit() {
return Scheduler.Event.NEXT;
}
var t;
var frameN;
var continueRoutine;
var gotValidClick;
var startComponents;
function startRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'start'-------
......@@ -192,6 +221,7 @@ function startRoutineBegin(snapshot) {
}
}
function startRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'start'-------
......@@ -225,6 +255,7 @@ function startRoutineEachFrame(snapshot) {
};
}
function startRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'start'-------
......@@ -239,6 +270,14 @@ function startRoutineEnd(snapshot) {
};
}
var scroll;
var lines;
var maxScroll;
var viewAll;
var dragging;
var moving;
var trialComponents;
function trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'trial'-------
......@@ -259,7 +298,7 @@ function trialRoutineBegin(snapshot) {
moving = 0;
scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
maxScroll = round(maxScroll*.02 / fontSize))-1;
maxScroll = round(maxScroll*.02 / fontSize)-1;
scrollText.setAlignHoriz('left');
scrollText.setAlignVert('top');
// keep track of which components have finished
......@@ -278,6 +317,9 @@ function trialRoutineBegin(snapshot) {
}
}
var _pj;
var keys;
function trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'trial'-------
......@@ -435,6 +477,7 @@ function trialRoutineEachFrame(snapshot) {
};
}
function trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'trial'-------
......@@ -450,6 +493,8 @@ function trialRoutineEnd(snapshot) {
};
}
var endComponents;
function endRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'end'-------
......@@ -470,6 +515,7 @@ function endRoutineBegin(snapshot) {
}
}
function endRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'end'-------
......@@ -513,6 +559,7 @@ function endRoutineEachFrame(snapshot) {
};
}
function endRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'end'-------
......@@ -528,6 +575,7 @@ function endRoutineEnd(snapshot) {
};
}
function endLoopIteration(scheduler, snapshot) {
// ------Prepare for next entry------
return function () {
......@@ -550,6 +598,7 @@ function endLoopIteration(scheduler, snapshot) {
};
}
function importConditions(currentLoop) {
return function () {
psychoJS.importAttributes(currentLoop.getCurrentTrial());
......@@ -557,6 +606,7 @@ function importConditions(currentLoop) {
};
}
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (psychoJS.experiment.isEntryEmpty()) {
......
scroll-text.js
View file @ 088dd430
......@@ -67,6 +67,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;
......@@ -86,6 +88,27 @@ function updateInfo() {
return Scheduler.Event.NEXT;
}
var startClock;
var thisExp;
var win;
var event;
var mouse;
var trialClock;
var screenRatio;
var fontSize;
var mouseY;
var trackLength;
var trackWidth;
var scrollText;
var scrollBar;
var scrollButton;
var bottomCrop;
var continueText;
var endClock;
var text;
var globalClock;
var routineTimer;
function experimentInit() {
// Initialize components for Routine "start"
startClock = new util.Clock();
......@@ -180,6 +203,12 @@ function experimentInit() {
return Scheduler.Event.NEXT;
}
var t;
var frameN;
var continueRoutine;
var gotValidClick;
var startComponents;
function startRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'start'-------
......@@ -202,6 +231,7 @@ function startRoutineBegin(snapshot) {
}
}
function startRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'start'-------
......@@ -235,6 +265,7 @@ function startRoutineEachFrame(snapshot) {
};
}
function startRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'start'-------
......@@ -249,6 +280,14 @@ function startRoutineEnd(snapshot) {
};
}
var scroll;
var lines;
var maxScroll;
var viewAll;
var dragging;
var moving;
var trialComponents;
function trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'trial'-------
......@@ -269,7 +308,7 @@ function trialRoutineBegin(snapshot) {
moving = 0;
scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
maxScroll = round(maxScroll*.02 / fontSize))-1;
maxScroll = round(maxScroll*.02 / fontSize)-1;
scrollText.setAlignHoriz('left');
scrollText.setAlignVert('top');
// keep track of which components have finished
......@@ -287,6 +326,9 @@ function trialRoutineBegin(snapshot) {
}
}
var _pj;
var keys;
function trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'trial'-------
......@@ -444,6 +486,7 @@ function trialRoutineEachFrame(snapshot) {
};
}
function trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'trial'-------
......@@ -459,6 +502,8 @@ function trialRoutineEnd(snapshot) {
};
}
var endComponents;
function endRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'end'-------
......@@ -478,6 +523,7 @@ function endRoutineBegin(snapshot) {
}
}
function endRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'end'-------
......@@ -521,6 +567,7 @@ function endRoutineEachFrame(snapshot) {
};
}
function endRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'end'-------
......@@ -536,6 +583,7 @@ function endRoutineEnd(snapshot) {
};
}
function endLoopIteration(scheduler, snapshot) {
// ------Prepare for next entry------
return function () {
......@@ -558,6 +606,7 @@ function endLoopIteration(scheduler, snapshot) {
};
}
function importConditions(currentLoop) {
return function () {
psychoJS.importAttributes(currentLoop.getCurrentTrial());
......@@ -565,6 +614,7 @@ function importConditions(currentLoop) {
};
}
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (psychoJS.experiment.isEntryEmpty()) {
......
scroll-text.psyexp
View file @ 088dd430
......@@ -143,7 +143,7 @@
<Param name="Before JS Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin Experiment" updates="constant" val="import math" valType="extendedCode"/>
<Param name="Begin JS Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="maxScroll = round(maxScroll*.02 / fontSize))-1;&amp;#10;scrollText.setAlignHoriz('left');&amp;#10;scrollText.setAlignVert('top');" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="maxScroll = round(maxScroll*.02 / fontSize)-1;&amp;#10;scrollText.setAlignHoriz('left');&amp;#10;scrollText.setAlignVert('top');" valType="extendedCode"/>
<Param name="Begin Routine" updates="constant" val="maxScroll-=round(1.5/fontSize)-1&amp;#10;scrollText.anchorHoriz='left'&amp;#10;scrollText.anchorVert='top'&amp;#10;scrollText.alignText='left'" valType="extendedCode"/>
<Param name="Code Type" updates="None" val="Both" valType="str"/>
<Param name="Each Frame" updates="constant" val="" valType="extendedCode"/>
......
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