Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions cardioception/HRD/languages.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ def danish(device: str, setup: str, exteroception: bool):
"done": "Du har genemført opgaven. Tak for din deltagalse.",
"slower": "Langsommere",
"faster": "Hurtigere",
"checkOximeter": "Sørg venligst for, at pulsoximeteret sidder rigtigt på din finger.",
"checkOximeter": "Sørg venligst for at pulsoximeteret sidder rigtigt på din finger.",
"stayStill": "Sid venglist rogligt under målingen",
"tooLate": "For langsomt",
"correctResponse": "Rigtigt",
"incorrectResponse": "Forkert",
"VASlabels": ["Gæt", "Helt sikker"],
"textHeartListening": "Mærk din hjertrytme",
"textHeartListening": "Mærk din hjerterytme",
"textToneListening": "Lyt til tonerne",
"textTaskStart": "Opgaven begynder nu, gør dig klar.",
"textBreaks": f"Pause. Du kan tage så lang en pause, som du har brug for. Bare {btnext} når du vil fortsætte opgaven.",
Expand Down Expand Up @@ -192,7 +192,7 @@ def danish(device: str, setup: str, exteroception: bool):

texts[
"pulseTutorial4"
] = "Indtast venligt nummeret på den finger, som du besluttede at placere puls oximeteret på."
] = "Indtast venligt nummeret på den finger som du besluttede at placere puls oximeteret på."

texts[
"Tutorial2"
Expand All @@ -202,7 +202,7 @@ def danish(device: str, setup: str, exteroception: bool):
lessResp = "NED tasten" if device == "keyboard" else "VENSTRE mussetast"
texts[
"Tutorial3_icon"
] = """Efter tidsrummet hvor du har lyttet til dit hjerte, vil du se det samme ikon og høre en række bib-lyde."""
] = """Efter tidsrummet hvor du har forsøgt at mærke dit hjerte, vil du se det samme ikon og høre en række bib-lyde."""
texts[
"Tutorial3_responses"
] = f"""Det følgende skal du gøre så hurtigt og præcist som muligt: Du vil lytte til disse bib-lyde og beslutte om de er hurtigere ({moreResp}) eller langsommere ({lessResp}) end din egen hjerterytme.
Expand Down
6 changes: 6 additions & 0 deletions cardioception/HRD/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ def getParameters(
`"mouse"`.
HRcutOff : list
Cut off for extreme heart rate values during recording.
isi : tuple
Range of the inter-stimulus interval (seconds). Should be in the form of (low,
high). At each trial the value is generated using a uniform distribution
between these two values. Default is set to `(0.25, 0.25)` so the value is
fixed at `0.25`.
labelsRating : list
The labels of the confidence rating scale.
lambdaExtero : 3d numpy array
Expand Down Expand Up @@ -207,6 +212,7 @@ def getParameters(
parameters["respMax"] = 5
parameters["minRatingTime"] = 0.5
parameters["maxRatingTime"] = 5
parameters["isi"] = (0.25, 0.25)
parameters["startKey"] = "space"
parameters["allowedKeys"] = ["up", "down"]
parameters["nTrials"] = nTrials
Expand Down
2 changes: 1 addition & 1 deletion cardioception/HRD/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ def trial(
fixation.draw()
parameters["win"].flip()
parameters["triggers"]["trialStart"] # Send triggers
core.wait(0.25)
core.wait(np.random.uniform(parameters["isi"][0], parameters["isi"][1]))

keys = event.getKeys()
if "escape" in keys:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read(fname):
DISTNAME = "cardioception"
MAINTAINER = "Nicolas Legrand"
MAINTAINER_EMAIL = "nicolas.legrand@cfin.au.dk"
VERSION = "0.4.2"
VERSION = "0.4.3"

INSTALL_REQUIRES = [
"systole>=0.1.3",
Expand Down