Commit 85f94b9c authored by Dasoo Milton Yoon's avatar Dasoo Milton Yoon

fda

parent 1f648953
......@@ -476,7 +476,7 @@
<Param name="stopType" updates="None" val="duration (s)" valType="str"/>
<Param name="stopVal" updates="constant" val="" valType="code"/>
<Param name="syncScreenRefresh" updates="None" val="True" valType="bool"/>
<Param name="text" updates="constant" val="$items" valType="str"/>
<Param name="text" updates="constant" val="$Items" valType="str"/>
<Param name="units" updates="None" val="from exp settings" valType="str"/>
<Param name="wrapWidth" updates="constant" val="" valType="code"/>
</TextComponent>
......@@ -534,7 +534,7 @@
<LoopTerminator name="trials"/>
<Routine name="Instruction_for_Feedback"/>
<LoopInitiator loopType="TrialHandler" name="trials_3">
<Param name="Selected rows" updates="None" val="$items" valType="str"/>
<Param name="Selected rows" updates="None" val="$feedback_items" valType="str"/>
<Param name="conditions" updates="None" val="[OrderedDict([('Items', '(7x5)-19=16'), ('corrANS', 's')]), OrderedDict([('Items', '(9x4)-18=19'), ('corrANS', 'k')]), OrderedDict([('Items', '(5x7)-17=18'), ('corrANS', 'k')]), OrderedDict([('Items', '(5x8)-16=24'), ('corrANS', 's')]), OrderedDict([('Items', '(5x9)-16=29'), ('corrANS', 'k')]), OrderedDict([('Items', '(4x6)-19=5'), ('corrANS', 's')]), OrderedDict([('Items', '(7x6)-18=22'), ('corrANS', 's')]), OrderedDict([('Items', '(4x7)-16=10'), ('corrANS', 'k')]), OrderedDict([('Items', '(5x8)-15=27'), ('corrANS', 's')]), OrderedDict([('Items', '(6x5)-19=11'), ('corrANS', 'k')]), OrderedDict([('Items', '(4x6)-16=10'), ('corrANS', 's')]), OrderedDict([('Items', '(4x6)-18=6'), ('corrANS', 'k')]), OrderedDict([('Items', '(5x8)-16=22'), ('corrANS', 's')]), OrderedDict([('Items', '(7x4)-17=11'), ('corrANS', 'k')]), OrderedDict([('Items', '(8x6)-17=31'), ('corrANS', 's')])]" valType="str"/>
<Param name="conditionsFile" updates="None" val="Items.xlsx" valType="str"/>
<Param name="endPoints" updates="None" val="[0, 1]" valType="num"/>
......
......@@ -263,7 +263,7 @@ function experimentInit() {
text_10 = new visual.TextStim({
win: psychoJS.window,
name: 'text_10',
text: items,
text: Items,
font: 'Arial',
units : undefined,
pos: [0, 0], height: 0.05, wrapWidth: undefined, ori: 0,
......@@ -886,7 +886,7 @@ function trials_3LoopBegin(thisScheduler) {
psychoJS: psychoJS,
nReps: 1, method: TrialHandler.Method.RANDOM,
extraInfo: expInfo, originPath: undefined,
trialList: TrialHandler.importConditions(psychoJS.serverManager, 'Items.xlsx', items),
trialList: TrialHandler.importConditions(psychoJS.serverManager, 'Items.xlsx', feedback_items),
seed: undefined, name: 'trials_3'});
psychoJS.experiment.addLoop(trials_3); // add the loop to the experiment
currentLoop = trials_3; // we're now the current loop
......
......@@ -255,7 +255,7 @@ function experimentInit() {
text_10 = new visual.TextStim({
win: psychoJS.window,
name: 'text_10',
text: items,
text: Items,
font: 'Arial',
units : undefined,
pos: [0, 0], height: 0.05, wrapWidth: undefined, ori: 0,
......@@ -885,7 +885,7 @@ function trials_3LoopBegin(thisScheduler) {
psychoJS: psychoJS,
nReps: 1, method: TrialHandler.Method.RANDOM,
extraInfo: expInfo, originPath: undefined,
trialList: TrialHandler.importConditions(psychoJS.serverManager, 'Items.xlsx', items),
trialList: TrialHandler.importConditions(psychoJS.serverManager, 'Items.xlsx', feedback_items),
seed: undefined, name: 'trials_3'});
psychoJS.experiment.addLoop(trials_3); // add the loop to the experiment
currentLoop = trials_3; // we're now the current loop
......
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