Preference

# HG changeset patch # User Nicholas Jillings # Date 1452084989 0 # Node ID 41ef099fbb6abc780fd40625fbec37b0b585f380 # Parent 3f65e594154db9570b3f72ca697026b319ab67b5 MUSHRA operating on new core / specification diff -r 3f65e594154d -r 41ef099fbb6a core.js --- a/core.js Wed Jan 06 12:28:22 2016 +0000 +++ b/core.js Wed Jan 06 12:56:29 2016 +0000 @@ -515,7 +515,7 @@ } } else if (node.specification.type == 'checkbox') { // Must extract checkbox data - console.log("Checkbox: "+ node.statement); + console.log("Checkbox: "+ node.specification.statement); var inputs = this.popupResponse.getElementsByTagName('input'); node.response = []; for (var i=0; i - - - - Please enter your name. - This is an example of a 'MUSHRA'-style test, with two pages, using the test stimuli in 'example_eval/'. - - - Please enter your location. (example mandatory text question) - Please enter your age (example non-mandatory number question) - + + + + + Please enter your name. + + + Please select with which activities you have any experience (example checkbox question) + + + + + + + + This is an example of an 'APE'-style test, with two pages, using the test stimuli in 'example_eval/'. + + + + + Please enter your location. (example mandatory text question) + + + Please enter your age (example non-mandatory number question) + + Please rate this interface (example radio button question) - - Thank you for taking this listening test. Please click 'submit' and your results will appear in the 'saves/' folder. - - - testTimer - elementTimer - elementInitialPosition - elementTracker - elementFlagListenedTo - elementFlagMoved - elementListenTracker - + + + Thank you for taking this listening test. Please click 'submit' and your results will appear in the 'saves/' folder. + + + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + - - - + + Comment on fragment - Preference - - Min - Max - Middle - 20 - Comment on fragment + + Min + Max + Middle + 20 + - - - - - - - Example of an 'MUSHRA' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, mandatory listening of every sample and set initialisation to 50% - - - Please enter the genre. - - - - - Example Test Question - Min - Max - Middle - 75 - - Comment on fragment - - - - - - - - - What is your general experience with numbers? - - Please enter your overall preference - - - - - - - - Please describe the overall character - - - - - - - Example of an 'MUSHRA' style interface with outside reference 'six', hidden anchor 'zero' (which needs to be below 20%), hidden reference 'one' (which needs to be above 80%), randomisation of marker labels. - - - Please enter the genre. - - - \ No newline at end of file + + + + + + + + Example of a 'MUSHRA' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. + + + + + Please enter the genre. + + + + + Comment on fragment + + Example Test Question + + Min + Max + Middle + 20 + + + + + + + + + + + What is your general experience with numbers? + + + Please enter your overall preference + + + + + + + + Please describe the overall character + + + + + + + + Example of a 'MUSHRA' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. + + + + + Please enter the genre. + + + + \ No newline at end of file diff -r 3f65e594154d -r 41ef099fbb6a example_eval/project-new.xml --- a/example_eval/project-new.xml Wed Jan 06 12:28:22 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,136 +0,0 @@ - - - - - - Please enter your name. - - - Please select with which activities you have any experience (example checkbox question) - - - - - - - - This is an example of an 'APE'-style test, with two pages, using the test stimuli in 'example_eval/'. - - - - - Please enter your location. (example mandatory text question) - - - Please enter your age (example non-mandatory number question) - - - Please rate this interface (example radio button question) - - - - - - - Thank you for taking this listening test. Please click 'submit' and your results will appear in the 'saves/' folder. - - - - testTimer - elementTimer - elementInitialPosition - elementTracker - elementFlagListenedTo - elementFlagMoved - elementListenTracker - - - - - - - - - - Comment on fragment - - - Min - Max - Middle - 20 - - - - Depth - - Low - High - Middle - Middle - - - - - - - - - - Example of an 'APE' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. - - - - - Please enter the genre. - - - - - Comment on fragment - - Example Test Question - - Min - Max - Middle - 20 - - - - - - - - - - - What is your general experience with numbers? - - - Please enter your overall preference - - - - - - - - Please describe the overall character - - - - - - - - Example of an 'APE' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. - - - - - Please enter the genre. - - - - \ No newline at end of file diff -r 3f65e594154d -r 41ef099fbb6a example_eval/project.xml --- a/example_eval/project.xml Wed Jan 06 12:28:22 2016 +0000 +++ b/example_eval/project.xml Wed Jan 06 12:56:29 2016 +0000 @@ -1,112 +1,136 @@ - - - - - Please enter your name. - - Please select with which activities you have any experience (example checkbox question) - - - - - - - This is an example of an 'APE'-style test, with two pages, using the test stimuli in 'example_eval/'. - - - Please enter your location. (example mandatory text question) - Please enter your age (example non-mandatory number question) - - Please rate this interface (example radio button question) - - - - - - Thank you for taking this listening test. Please click 'submit' and your results will appear in the 'saves/' folder. - - - testTimer - elementTimer - elementInitialPosition - elementTracker - elementFlagListenedTo - elementFlagMoved - elementListenTracker - - - - - - - - - Min - Max - Middle - 20 - Comment on fragment - - - Depth - Low - High - Middle - - - - - - - - Example of an 'APE' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. - - - Please enter the genre. - - - - - Example Test Question - Min - Max - Middle - 75 - - Comment on fragment - - - - - - - - - - What is your general experience with numbers? - - - Please enter your overall preference - - - - - - - - Please describe the overall character - - - - - - - Example of an 'APE' style interface with outside reference 'six', hidden anchor 'zero' (which needs to be below 20%), hidden reference 'one' (which needs to be above 80%), randomisation of marker labels, and a forced scale usage of at least 25%-75%. - - - Please enter the genre. - - - \ No newline at end of file + + + + + + Please enter your name. + + + Please select with which activities you have any experience (example checkbox question) + + + + + + + + This is an example of an 'APE'-style test, with two pages, using the test stimuli in 'example_eval/'. + + + + + Please enter your location. (example mandatory text question) + + + Please enter your age (example non-mandatory number question) + + + Please rate this interface (example radio button question) + + + + + + + Thank you for taking this listening test. Please click 'submit' and your results will appear in the 'saves/' folder. + + + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + + + Comment on fragment + + + Min + Max + Middle + 20 + + + + Depth + + Low + High + Middle + Middle + + + + + + + + + + Example of an 'APE' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. + + + + + Please enter the genre. + + + + + Comment on fragment + + Example Test Question + + Min + Max + Middle + 20 + + + + + + + + + + + What is your general experience with numbers? + + + Please enter your overall preference + + + + + + + + Please describe the overall character + + + + + + + + Example of an 'APE' style interface with hidden anchor 'zero' (which needs to be below 20%), looping of the samples, randomisation of marker labels, mandatory moving of every sample, and a forced scale usage of at least 25%-75%. + + + + + Please enter the genre. + + + + \ No newline at end of file diff -r 3f65e594154d -r 41ef099fbb6a mushra.js --- a/mushra.js Wed Jan 06 12:28:22 2016 +0000 +++ b/mushra.js Wed Jan 06 12:56:29 2016 +0000 @@ -171,7 +171,7 @@ } sliderBox.appendChild(audioObject.interfaceDOM.holder); - audioObject.metric.initialised(audioObject.interfaceDOM.slider.value); + audioObject.metric.initialise(audioObject.interfaceDOM.slider.value); }); @@ -322,7 +322,9 @@ function buttonSubmitClick() // TODO: Only when all songs have been played! { - var checks = testState.currentStateMap[testState.currentIndex].interfaces[0].options; + var checks = []; + checks = checks.concat(testState.currentStateMap.interfaces[0].options); + checks = checks.concat(specification.interfaces.options); var canContinue = true; // Check that the anchor and reference objects are correctly placed @@ -332,7 +334,7 @@ for (var i=0; i