-
Notifications
You must be signed in to change notification settings - Fork 161
Preference test #91
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.
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
Open
Simon-Stone
wants to merge
17
commits into
audiolabs:master
Choose a base branch
from
Simon-Stone:preference_test
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Preference test #91
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
e842b16
Added a version check so get_magic_quotes_gpc() is only used for PHP …
Simon-Stone 2adb2bd
Merge branch 'audiolabs:master' into master
Simon-Stone 34116f7
started working on the preference test. Nothing is working so far.
54ad3ff
adds a working prototype of the preference test. Also adds ability to…
c90510c
adds support for grouped stimuli so that only pairs from each group a…
bb3fed8
adds support for 'mustPlay' flag
6d47a8c
adds hotkey notice
98a560f
added some more explanations
f2a4566
removing personal config yaml and adding demo yamls for the Preferenc…
721fe84
fixes a bug when certain config paramters are undefined
14c4276
adds documentation for the preference_test page and makes the pref_gr…
8e7eb41
adds documentation in the doc files
2c2cee1
removes some dead code
b062a7a
adds a dropdown to the widget options for the questionnaire
137aee1
restores to a generic version
a370979
fixes missing time calculation
8117a0f
Update lib/webmushra/pages/PreferenceTestPage.js
Simon-Stone File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # test config preference test | ||
|
|
||
|
|
||
| testname: Preference test | ||
| testId: pref | ||
| bufferSize: 2048 | ||
| stopOnErrors: true | ||
| showButtonPreviousPage: true | ||
| remoteService: service/write.php | ||
|
|
||
| pages: | ||
| - type: preference_test | ||
| id: trialpref | ||
| name: Preference test | ||
| content: | | ||
| <p><b>Which sound do you prefer?</b></p> | ||
| considerOrder: true | ||
| mustPlayback: ended | ||
Simon-Stone marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| stimuli: | ||
| C1: configs/resources/audio/mono_c1.wav | ||
| C2: configs/resources/audio/mono_c2.wav | ||
| C3: configs/resources/audio/mono_c3.wav | ||
|
|
||
| - type: finish | ||
| name: Thank you | ||
| content: Thank you for attending | ||
| showResults: true | ||
| writeResults: true | ||
| generateSubjectId: true | ||
| confirmationCode: your_code_here | ||
Simon-Stone marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # test config preference test | ||
|
|
||
|
|
||
| testname: Preference test | ||
| testId: pref_grouped | ||
| bufferSize: 2048 | ||
| stopOnErrors: true | ||
| showButtonPreviousPage: true | ||
| remoteService: service/write.php | ||
|
|
||
| pages: | ||
| - type: preference_test | ||
| id: trialpref | ||
| name: Preference test | ||
| content: | | ||
| <p><b>Which sound do you prefer?</b></p> | ||
| considerOrder: true | ||
| stimuli: | ||
| - C1: configs/resources/audio/mono_c1.wav | ||
| C2: configs/resources/audio/mono_c2.wav | ||
| - C3: configs/resources/audio/mono_c3.wav | ||
| C2: configs/resources/audio/mono_c2.wav | ||
|
|
||
| - type: finish | ||
| name: Thank you | ||
| content: Thank you for attending | ||
| showResults: true | ||
| writeResults: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /************************************************************************* | ||
| (C) Copyright AudioLabs 2017 | ||
|
|
||
| This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law. | ||
|
|
||
| **************************************************************************/ | ||
|
|
||
| function PreferenceTestChoice() { | ||
| this.optionA = null; | ||
| this.optionB = null; | ||
| this.answer = null; | ||
| this.comment = null; | ||
| this.time = null; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.