HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity

Merge 6c7e8cf29f into 702cbc57b0

Browse Source
This commit is contained in:
Eitan Hemed 2024-02-04 13:33:25 +02:00 committed by GitHub
commit 85989743bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/data/ExperimentHandler.js
View File

@ -56,12 +56,14 @@ export class ExperimentHandler extends PsychObject
* @param {module:core.PsychoJS} options.psychoJS - the PsychoJS instance
* @param {string} options.name - name of the experiment
* @param {Object} options.extraInfo - additional information, such as session name, participant name, etc.
* @param {string} field_separator - Delimiter character specification
*/
constructor({
psychoJS,
name,
extraInfo,
dataFileName
dataFileName,
field_separator
} = {})
{
super(psychoJS, name);
@ -88,6 +90,13 @@ export class ExperimentHandler extends PsychObject
`${this._participant}_${this._experimentName}_${this._datetime}`
);
this._addAttribute("field_separator",
(typeof field_separator === "string" || field_separator.length === 1 || field_separator !== '\n')
? field_separator
: ',',
','
);
// loop handlers:
this._loops = [];
this._unfinishedLoops = [];
@ -98,6 +107,8 @@ export class ExperimentHandler extends PsychObject
this._currentTrialData = {};
this._experimentEnded = false;
}
/**
@ -292,7 +303,7 @@ export class ExperimentHandler extends PsychObject
// TODO only save the given attributes
const worksheet = XLSX.utils.json_to_sheet(data);
// prepend BOM
const csv = "\ufeff" + XLSX.utils.sheet_to_csv(worksheet);
const csv = "\ufeff" + XLSX.utils.sheet_to_csv(worksheet, {FS: this.field_separator});
// upload data to the pavlovia server or offer them for download:
const filenameWithoutPath = this._dataFileName.split(/[\\/]/).pop();