Skip to content

Commit

Permalink
feat: add new images UWV
Browse files Browse the repository at this point in the history
  • Loading branch information
ymijsters committed Jan 31, 2025
1 parent aa1be20 commit 3d1efb4
Show file tree
Hide file tree
Showing 129 changed files with 10 additions and 7 deletions.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file added public/assets/pareidolia-imgs/test/1-test.png
Binary file added public/assets/pareidolia-imgs/test/10-test.png
Binary file added public/assets/pareidolia-imgs/test/11-test.png
Binary file added public/assets/pareidolia-imgs/test/12-test.png
Binary file added public/assets/pareidolia-imgs/test/13-test.png
Binary file added public/assets/pareidolia-imgs/test/14-test.png
Binary file added public/assets/pareidolia-imgs/test/15-test.png
Binary file added public/assets/pareidolia-imgs/test/16-test.png
Binary file added public/assets/pareidolia-imgs/test/17-test.png
Binary file added public/assets/pareidolia-imgs/test/18-test.png
Binary file added public/assets/pareidolia-imgs/test/19-test.png
Binary file added public/assets/pareidolia-imgs/test/2-test.png
Binary file added public/assets/pareidolia-imgs/test/20-test.png
Binary file added public/assets/pareidolia-imgs/test/21-test.png
Binary file added public/assets/pareidolia-imgs/test/22-test.png
Binary file added public/assets/pareidolia-imgs/test/23-test.png
Binary file added public/assets/pareidolia-imgs/test/24-test.png
Binary file added public/assets/pareidolia-imgs/test/25-test.png
Binary file added public/assets/pareidolia-imgs/test/26-test.png
Binary file added public/assets/pareidolia-imgs/test/27-test.png
Binary file added public/assets/pareidolia-imgs/test/28-test.png
Binary file added public/assets/pareidolia-imgs/test/29-test.png
Binary file added public/assets/pareidolia-imgs/test/3-test.png
Binary file added public/assets/pareidolia-imgs/test/30-test.png
Binary file added public/assets/pareidolia-imgs/test/31-test.png
Binary file added public/assets/pareidolia-imgs/test/32-test.png
Binary file added public/assets/pareidolia-imgs/test/33-test.png
Binary file added public/assets/pareidolia-imgs/test/34-test.png
Binary file added public/assets/pareidolia-imgs/test/35-test.png
Binary file added public/assets/pareidolia-imgs/test/36-test.png
Binary file added public/assets/pareidolia-imgs/test/37-test.png
Binary file added public/assets/pareidolia-imgs/test/38-test.png
Binary file added public/assets/pareidolia-imgs/test/39-test.png
Binary file added public/assets/pareidolia-imgs/test/4-test.png
Binary file added public/assets/pareidolia-imgs/test/40-test.png
Binary file added public/assets/pareidolia-imgs/test/5-test.png
Binary file added public/assets/pareidolia-imgs/test/6-test.png
Binary file added public/assets/pareidolia-imgs/test/7-test.png
Binary file added public/assets/pareidolia-imgs/test/8-test.png
Binary file added public/assets/pareidolia-imgs/test/9-test.png
6 changes: 3 additions & 3 deletions src/modules/experiment/jspsych/experiment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ const generateTimelineVars = (
): ImageDescription[] => {
const timelineVariables: ImageDescription[] = [];

// Generate an array of numbers from 1 to 40
const numPool = Array.from({ length: 40 }, (_, i) => i + 1);
// Generate an array of numbers from 1 to 80
const numPool = Array.from({ length: 80 }, (_, i) => i + 1);

// Sample numbers without replacement
const sampledNums: number[] = jsPsych.randomization.sampleWithoutReplacement(
Expand Down Expand Up @@ -249,7 +249,7 @@ const partofexp: (
type: jsPsychHtmlKeyboardResponse,
stimulus() {
const html = `<div>
<div class="task-img"><img class="task-img" id="task-img" src='./assets/pareidolia-imgs/test/pareidolia-test-${jsPsych.evaluateTimelineVariable('num') > 9 ? jsPsych.evaluateTimelineVariable('num') : `0${jsPsych.evaluateTimelineVariable('num')}`}.jpg' alt='task image'/></div>
<div class="task-img"><img class="task-img" id="task-img" src='./assets/pareidolia-imgs/test/${(jsPsych.evaluateTimelineVariable('num') % 40) + 1}-test${jsPsych.evaluateTimelineVariable('num') > 40 ? '-modified' : ''}.png' alt='task image'/></div>
<div class="task-text"><b>${keySettings.noFaceKey.toUpperCase()}: No Face</b><b>${keySettings.faceKey.toUpperCase()}: Face</b></div>
<div class='photo-diode photo-diode-white ${usePhotoDiode === 'top-left' ? 'top-left' : 'top-right'} ${usePhotoDiode === 'off' ? 'photo-diode-hide' : ''}'/>
</div>`;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/experiment/jspsych/practice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const practiceTrials: (
type: jsPsychHtmlKeyboardResponse,
stimulus() {
const html = `<div>
<div class="task-img"><img class="task-img" id="task-img" src='./assets/pareidolia-imgs/practice/pareidolia-practice-${jsPsych.evaluateTimelineVariable('num') > 9 ? jsPsych.evaluateTimelineVariable('num') : `0${jsPsych.evaluateTimelineVariable('num')}`}.jpg' alt='task image'/></div>
<div class="task-img"><img class="task-img" id="task-img" src='./assets/pareidolia-imgs/practice/${jsPsych.evaluateTimelineVariable('num')}-practice.png' alt='task image'/></div>
<div class="task-text"><b>${keySettings.noFaceKey.toUpperCase()}: No Face</b><b>${keySettings.faceKey.toUpperCase()}: Face</b></div>
<div class='photo-diode photo-diode-white ${usePhotoDiode === 'top-left' ? 'top-left' : 'top-right'} ${usePhotoDiode === 'off' ? 'photo-diode-hide' : ''}'/>
</div>`;
Expand Down
9 changes: 6 additions & 3 deletions src/modules/experiment/jspsych/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@ export function generatePreloadStrings(): string[] {
// Use nested loops to construct the file paths
cntables.forEach((cntable, index) => {
for (let id: number = 1; id < nrOfImages[index]; id += 1) {
pathList.push(
`./assets/pareidolia-imgs/${cntable}/pareidolia-${cntable}-${id < 10 ? `0${id}` : id}.jpg`,
);
pathList.push(`./assets/pareidolia-imgs/${cntable}/${id}-${cntable}.png`);
if (cntable === 'test') {
pathList.push(
`./assets/pareidolia-imgs/${cntable}/${id}-${cntable}-modified.png`,
);
}
}
});
return pathList;
Expand Down

0 comments on commit 3d1efb4

Please sign in to comment.