Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pavlovia compatibility #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Pavlovia compatibility #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aafd372
Complex Span Task
MikoBie Mar 9, 2022
c57be7d
Works both offline and online on Pavlovia.
MikoBie Apr 25, 2022
3f5acdc
Clean-up data folder
MikoBie Apr 25, 2022
5377535
Clean-up data folder and update README.md
MikoBie Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ of working memory capacity.
### Requirements

Softwares needed:
- PsychoPy (https://www.psychopy.org/download.html)
- R 3.6.1 (https://cran.r-project.org/bin/windows/base/)
- R Studio (https://rstudio.com/products/rstudio/download/)
- PsychoPy >= v2021.1.4 (https://www.psychopy.org/download.html)
- R >= 3.6.1 (https://cran.r-project.org/bin/windows/base/)
- RStudio >= 2021.09.0 (https://rstudio.com/products/rstudio/download/)

Packages needed in R:
- [tidyverse](https://cran.r-project.org/web/packages/tidyverse/index.html)
Expand All @@ -43,7 +43,6 @@ Packages needed in R:
2. Click on the green button to begin the task
3. Enter participant number and session number
4. Run task
- Instruct participants not to press "Enter" at any point during the task unless required, as the experiment would quit if so
5. Task outputs 3 files: a csv file, a text document, and a psydat file

### Preprocess the data
Expand Down
Binary file removed desktop.ini
View file
Open in desktop
Binary file not shown.
40 changes: 40 additions & 0 deletions html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!doctype html>
<html>

<head>
<title>task [PsychoPy]</title>
<meta charset="UTF-8">
<meta name="viewport" content="user-scalable=no">

<!-- styles -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css">
<link rel="stylesheet" href="https://lib.pavlovia.org/psychojs-2021.1.4.css">
</head>

<body>
<div id="root"></div>

<!-- external libraries -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/seedrandom/3.0.1/seedrandom.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected]/dist/pixi-legacy.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/PreloadJS/1.0.1/preloadjs.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.16.7/xlsx.full.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/log4javascript/1.4.9/log4javascript.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tone/14.7.61/Tone.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.1/howler.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pako/1.0.10/pako.min.js"></script>

<!-- experiment -->
<script type='module' src='./task.js'></script>

<!-- legacy browsers -->
<script nomodule type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.6.0/polyfill.min.js"></script>
<script nomodule type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/url-search-params/1.1.0/url-search-params.js"></script>
<script nomodule type="text/javascript" src="https://lib.pavlovia.org/psychojs-2021.1.4.js"></script>
<script nomodule type="text/javascript" src="./task-legacy-browsers.js"></script>
</body>

</html>
2 changes: 2 additions & 0 deletions html/resources/resources/letters.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
letter
"Z Q J H K T S N R X L V"
Binary file added html/resources/resources/processing_only_2.xlsx
View file
Open in desktop
Binary file not shown.
Loading