# HG changeset patch # User www-data # Date 1501597427 -3600 # Node ID 300bb2bbba4a2e1e15879d22be0fb62d27980b73 # Parent 0e4b844970406fa1bd22b12ec95ef494adbf89c1# Parent 03a66e54cdff24a98d0085c11a0a4c59758e1437 Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool diff -r 0e4b84497040 -r 300bb2bbba4a interfaces/mushra.js --- a/interfaces/mushra.js Thu Jul 27 21:00:36 2017 +0100 +++ b/interfaces/mushra.js Tue Aug 01 15:23:47 2017 +0100 @@ -179,7 +179,7 @@ audioObject.bindInterface(orNode); } else { // Create a slider per track - var label = interfaceContext.getLabel(labelType, index, audioHolderObject.labelStart); + var label = element.label || interfaceContext.getLabel(labelType, index, audioHolderObject.labelStart); var sliderObj = new sliderObject(audioObject, label); if (typeof audioHolderObject.initialPosition === "number") { diff -r 0e4b84497040 -r 300bb2bbba4a js/core.js --- a/js/core.js Thu Jul 27 21:00:36 2017 +0100 +++ b/js/core.js Tue Aug 01 15:23:47 2017 +0100 @@ -555,7 +555,7 @@ this.store = null; var lastNodeStart; $(window).keypress(function (e) { - if (e.keyCode == 13 && popup.popup.style.visibility == 'visible') { + if (e.keyCode == 13 && popup.popup.style.visibility == 'visible' && interfaceContext.lightbox.isVisible() === false) { console.log(e); popup.buttonProceed.onclick(); e.preventDefault(); @@ -1216,6 +1216,39 @@ this.currentStore = null; this.initialise = function () { + function randomiseElements(page) { + // Get the elements which are fixed / labelled + var fixed = [], + or = [], + remainder = []; + page.audioElements.forEach(function (a) { + if (a.label.length > 0 || a.postion !== undefined) { + fixed.push(a); + } else if (a.type === "outside-reference") { + or.push(a); + } else { + remainder.push(a); + } + }) + if (page.poolSize > 0 || page.randomiseOrder) { + page.randomiseOrder = true; + if (page.poolSize === 0) { + page.poolSize = page.audioElements.length; + } + page.poolSize -= fixed.length; + remainder = pickSubPool(remainder, page.poolSize); + } + // Randomise the remainders + if (page.randomiseOrder) { + remainder = randomiseOrder(remainder); + } + fixed = fixed.concat(remainder); + page.audioElements = fixed.concat(or); + page.audioElements.forEach(function (a, i) { + a.position = i; + }); + } + // Get the data from Specification var pagePool = []; specification.pages.forEach(function (page) { @@ -1253,17 +1286,7 @@ page.presentedId = i; this.stateMap.push(page); var elements = page.audioElements; - if (page.poolSize > 0 || page.randomiseOrder) { - page.randomiseOrder = true; - if (page.poolSize === 0) { - page.poolSize = elements.length; - } - elements = pickSubPool(elements, page.poolSize); - } - if (page.randomiseOrder) { - elements = randomiseOrder(elements); - } - page.audioElements = elements; + randomiseElements(page); storage.createTestPageStore(page); audioEngineContext.loadPageData(page); }, this); @@ -1325,23 +1348,6 @@ popup.hidePopup(); if (this.currentStateMap === null) { this.currentStateMap = this.stateMap[this.stateIndex]; - // Find and extract the outside reference - var elements = [], - ref = []; - var elem = this.currentStateMap.audioElements.pop(); - while (elem) { - if (elem.type == "outside-reference") { - ref.push(elem); - } else { - elements.push(elem); - } - elem = this.currentStateMap.audioElements.pop(); - } - elements = elements.reverse(); - if (this.currentStateMap.randomiseOrder) { - elements = randomiseOrder(elements); - } - this.currentStateMap.audioElements = elements.concat(ref); this.currentStore = storage.testPages[this.stateIndex]; if (this.currentStateMap.preTest !== undefined) { @@ -2401,6 +2407,7 @@ show: function () { this.root.style.visibility = "visible"; this.blanker.style.visibility = "visible"; + this.accept.focus(); }, clear: function () { this.root.style.visibility = ""; @@ -2414,6 +2421,9 @@ }, resize: function (event) { this.root.style.left = (window.innerWidth / 2) - 250 + 'px'; + }, + isVisible: function () { + return this.root.style.visibility == "visible"; } }; diff -r 0e4b84497040 -r 300bb2bbba4a test_create.html --- a/test_create.html Thu Jul 27 21:00:36 2017 +0100 +++ b/test_create.html Tue Aug 01 15:23:47 2017 +0100 @@ -12,13 +12,14 @@ - WAET 1.2.1 Test Creator + WAET 1.2.2 Test Creator
-

Web Audio Evaluation Tool - Test Creator

+

Web Audio Evaluation Tool

+

Test Creator v1.2.2

@@ -45,7 +46,9 @@
Interface: - +
Save URL: @@ -53,7 +56,7 @@
Exit URL: - +
Randomise Page Order: @@ -61,15 +64,15 @@
Page Pool Size: - +
Loudness Normalisation (LUFS): - +
Fixed Sampling Rate: - +
Pre-Test audio calibration: @@ -77,15 +80,15 @@
Global Cross-fade time: - +
Global Fragment Pre-Silence: - +
Global Fragment Post-Silence: - +
Play audio one-at-a-time: @@ -93,11 +96,11 @@
Minimum number of fragment plays - +
Maximum number of fragment plays - +
@@ -140,11 +143,11 @@

Pre Test Survey

-
+

Survey Entry

-
+
Survey Type:
-
+
Unique Survey Entry ID:
-
+
Entry Name:
-
+
Mandatory:
-
+
Minimum Wait Time (s):
-
+
Box Size:
-
+
Minimum Selected:
-
+
Maximum Selected:
-
+
Minimum Value:
-
+
Maximum Value:
-
+
Video URL:
-
+

Statement

@@ -271,11 +274,11 @@

Post Test Survey

-
+

Survey Entry

-
+
Survey Type:
-
+
Unique Survey Entry ID:
-
+
Entry Name:
-
+
Mandatory:
-
+
Minimum Wait Time (s):
-
+
Box Size:
-
+
Minimum Selected:
-
+
Maximum Selected:
-
+
Minimum Value:
-
+
Maximum Value:
-
+
Video URL:
-
+

Statement

@@ -403,23 +406,23 @@

Interface (Globals)

-
+
Check all fragments played:
-
+
Check all fragments fully played:
-
+
Check all fragments have been moved:
-
+
Check all fragments have comments:
-
+
Enforce a scale usage: Minimum: @@ -427,19 +430,19 @@ Maximum:
-
+
Show master volume control:
-
+
Show playhead:
-
+
Show Page Count:
-
+
Show Fragment Comments:
@@ -467,8 +470,8 @@
- Repeat Page N-times: - + Numer of repetitions: +
Loop audio: @@ -480,7 +483,7 @@
Loudness (page): - +
Label type: @@ -499,7 +502,7 @@
Fragment pool size: - +
Always include page: @@ -511,11 +514,11 @@
Fragment pre-silence: - +
Fragment post-silence: - +
Cannot interupt audio: @@ -527,11 +530,11 @@
Minimum number of fragment plays - +
Maximum number of fragment plays - +
@@ -548,11 +551,11 @@

Pre Page Survey

-
+

Survey Entry

-
+
Survey Type:
-
+
Unique Survey Entry ID:
-
+
Entry Name:
-
+
Mandatory:
-
+
Minimum Wait Time (s):
-
+
Box Size:
-
+
Minimum Selected:
-
+
Maximum Selected:
-
+
Minimum Value:
-
+
Maximum Value:
-
+
Video URL:
-
+

Statement

@@ -679,11 +682,11 @@

Post Page Survey

-
+

Survey Entry

-
+
Survey Type:
-
+
Unique Survey Entry ID: - +
-
+
Entry Name:
-
+
Mandatory:
-
+
Minimum Wait Time (s):
-
+
Box Size:
-
+
Minimum Selected:
-
+
Maximum Selected:
-
+
Minimum Value:
-
+
Maximum Value:
-
+
Video URL:
-
+

Statement

@@ -808,7 +811,7 @@
-
+

Interface

@@ -955,15 +958,15 @@
-
+

Audio Fragment

-
+
Unique ID:
-
+
URL: Full URL: {{page.hostURL}}{{fragment.url}} @@ -991,15 +994,15 @@
Anchor must be below: - +
Reference must be above: - +
Loudness: - +
Always include fragment: @@ -1044,13 +1047,13 @@
- Test Creator + Test Creator v1.2.2 Create New Test
- Welcome to the WAET test creator tool. This will allow you to create a new test from scratch to suit your testing needs. If you wish to update a test file, please drag and drop the XML document into the area below for processing, otherwise press 'Next' to start a new test. This tool generates files for the WAET 1.2.1 version. + Welcome to the WAET test creator tool. This will allow you to create a new test from scratch to suit your testing needs. If you wish to update a test file, please drag and drop the XML document into the area below for processing, otherwise press 'Next' to start a new test. This tool generates files for the WAET 1.2.2 version.
@@ -1062,7 +1065,7 @@
-
+
diff -r 0e4b84497040 -r 300bb2bbba4a test_create/interfaces/specifications.json --- a/test_create/interfaces/specifications.json Thu Jul 27 21:00:36 2017 +0100 +++ b/test_create/interfaces/specifications.json Tue Aug 01 15:23:47 2017 +0100 @@ -10,56 +10,6 @@ "show": [], "elements": [] }, { - "name": "MUSHRA", - "interface": "MUSHRA", - "description": { - "en": "Multi-stimulus with hidden reference and anchor. Each fragment is shown on its own vertical slider. One fragment must be labelled as a reference and another labelled as an anchor. One external reference must also be shown." - }, - "scales": ["ACR"], - "checks": [{ - "name": "fragmentMoved", - "support": "none" - }, { - "name": "fragmentPlayed", - "support": "none" - }, { - "name": "fragmentFullPlayback", - "support": "none" - }, { - "name": "fragmentComments", - "support": "none" - }, { - "name": "scalerange", - "support": "none" - }], - "show": [{ - "name": "volume", - "support": "none" - }, { - "name": "page-count", - "support": "none" - }, { - "name": "playhead", - "support": "none" - }, { - "name": "comments", - "support": "none" - }], - "elements": [{ - "anchor": { - "min": 1, - "max": "undefined" - }, - "reference": { - "min": 1, - "max": "undefined" - }, - "outsidereference": { - "min": 1, - "max": "undefined" - } - }] - }, { "name": "Vertical Sliders", "interface": "MUSHRA", "description": { @@ -78,7 +28,7 @@ "en": "Each element is given a horizontal scale broken into a number of discrete choices. The number of choices is defined by the scale markers." } }, { - "name": "Rank", + "name": "Rank/Ordinal", "interface": "ordinal", "description": { "en": "Each stimulus is placed on a discrete scale equalling the number of fragments. The fragments are then ranked based on the question posed. Only one element can occupy a rank position" @@ -114,38 +64,19 @@ "support": "none" }] }, { - "name": "ABC/HR", + "name": "ABC/HR (ITU-R BS.1116)", "interface": "MUSHRA", "description": { - "en": "Each stimulus is placed on a vertical slider. The scale is fixed with the labels 'Imperceptible' to 'Very Annoying'" + "en": "Double-blind triple-stimulus with hidden reference. Each fragment is shown on its own vertical slider. One fragment must be labelled as a reference and placed as fragment A. This must be copied again and then the tested difference as the third fragment. ITU-R BS.1116-3" }, - "scales": ["ABC"], - "checks": [{ - "name": "fragmentMoved", - "support": "none" - }, { - "name": "fragmentPlayed", - "support": "none" - }, { - "name": "fragmentFullPlayback", - "support": "none" - }, { - "name": "fragmentComments", - "support": "none" - }], - "show": [{ - "name": "volume", - "support": "none" - }, { - "name": "page-count", - "support": "none" - }, { - "name": "playhead", - "support": "none" - }, { - "name": "comments", - "support": "none" - }] + "template": "./tests/templates/itur1116.xml" + }, { + "name": "MUSHRA (ITU-R BS.1534)", + "interface": "MUSHRA", + "description": { + "en": "Multiple Stimulus with hiddren reference and anchor. At least four fragments must be shown, an outside reference, hidden reference, hidden anchor and the test candidate. ITU-R BS.1534-3" + }, + "template": "./tests/templates/itur1534.xml" }, { "name": "Bipolar", "interface": "horizontal", diff -r 0e4b84497040 -r 300bb2bbba4a test_create/style.css --- a/test_create/style.css Thu Jul 27 21:00:36 2017 +0100 +++ b/test_create/style.css Tue Aug 01 15:23:47 2017 +0100 @@ -74,10 +74,10 @@ width: 80%; } .node > h1, -h2, -h3, -h4, -h5 { +.node > h2, +.node > h3, +.node > h4, +.node > h5 { text-align: center; } .attribute { diff -r 0e4b84497040 -r 300bb2bbba4a test_create/test_core.js --- a/test_create/test_core.js Thu Jul 27 21:00:36 2017 +0100 +++ b/test_create/test_core.js Tue Aug 01 15:23:47 2017 +0100 @@ -35,10 +35,14 @@ window.onload = function () { // Get the test interface specifications + toggleDropdowns(); +}; + +function toggleDropdowns() { $(function () { $('[data-toggle="popover"]').popover(); }); -}; +} function handleFiles(event) { var s = angular.element(event.currentTarget).scope(); @@ -82,6 +86,11 @@ specification.processSchema(text); $s.globalSchema = specification.getSchema(); }); + $s.availableInterfaceModules = []; + get("interfaces/interfaces.json").then(JSON.parse).then(function (d) { + $s.availableInterfaceModules = d.interfaces; + $s.$apply(); + }); $s.specification = specification; $s.selectedTestPrototype = undefined; $s.setTestPrototype = function (obj) { @@ -112,10 +121,12 @@ }); var dnlk = window.URL.createObjectURL(bb); var a = document.createElement("a"); + document.body.appendChild(a) a.href = dnlk; a.download = "test.xml"; a.click(); window.URL.revokeObjectURL(dnlk); + document.body.removeChild(a); }; $s.validated = false; $s.showValidationMessages = false; @@ -149,14 +160,28 @@ $s.hideValidationMessages = function () { $s.showValidationMessages = false; } + $s.$watch(function () { + return document.querySelectorAll("div.pageNode").length; + }, $w.toggleDropdowns); + $s.$watch(function () { + return document.querySelectorAll("div.surveyentry").length; + }, $w.toggleDropdowns); + $s.$watch(function () { + return document.querySelectorAll("div.interface").length; + }, $w.toggleDropdowns); + $s.$watch(function () { + return document.querySelectorAll("div.audioelement").length; + }, $w.toggleDropdowns); }]); AngularInterface.controller("introduction", ['$scope', '$element', '$window', function ($s, $e, $w) { $s.state = 0; + $s.selected = undefined; $s.next = function () { $s.state++; if ($s.state > 1 || $s.file) { $s.hidePopup(); + $s.initialise($s.selected); } }; $s.back = function () { @@ -177,19 +202,32 @@ if (obj === undefined) { throw ("Cannot find specification"); } - $s.setTestPrototype(obj); + if (typeof obj.template === "string") { + get(obj.template).then(function (data) { + $s.parseFile(data); + }, function (err) {}) + } else { + $s.setTestPrototype(obj); + } }; - // Get the test interface specifications + $s.select = function (name) { + $s.selected = name; + } + // Get the test interface specifications $s.file = undefined; $s.description = ""; + $s.parseFile = function (f) { + var p = new DOMParser(); + specification.decode(p.parseFromString(f, "text/xml")); + $s.$apply(); + } + $s.handleFiles = function ($event) { $s.file = $event.currentTarget.files[0]; var r = new FileReader(); r.onload = function () { - var p = new DOMParser(); - specification.decode(p.parseFromString(r.result, "text/xml")); - $s.$apply(); + $s.parseFile(r.result); }; r.readAsText($s.file); }; @@ -240,6 +278,17 @@ $s.configure = function () {} $s.$watch("selectedTestPrototype", $s.configure); + + $s.placeholder = function (name) { + if ($s.schema) { + var spec = $s.schema.querySelector("attribute[name=\"" + name + "\"]") || $w.specification.schema.querySelector("attribute[name=\"" + name + "\"]"); + var attr = spec.getAttribute("default"); + if (attr === null) { + return "Not set"; + } + return attr; + } + } }]); AngularInterface.controller("survey", ['$scope', '$element', '$window', function ($s, $e, $w) { @@ -413,6 +462,8 @@ $s.configure(); }]); AngularInterface.controller("page", ['$scope', '$element', '$window', function ($s, $e, $w) { + $s.schema = $w.specification.schema.querySelector("element[name=\"page\"]"); + $s.page.label = $s.page.label || "default"; $s.addInterface = function () { $s.page.addInterface(); }; @@ -450,4 +501,13 @@ } $s.page.audioElements.splice(index, 1); }; + + $s.placeholder = function (name) { + var spec = $s.schema.querySelector("attribute[name=\"" + name + "\"]") || $w.specification.schema.querySelector("attribute[name=\"" + name + "\"]"); + var attr = spec.getAttribute("default"); + if (attr === null) { + return "Not set"; + } + return attr; + } }]); diff -r 0e4b84497040 -r 300bb2bbba4a tests/templates/itur1116.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/templates/itur1116.xml Tue Aug 01 15:23:47 2017 +0100 @@ -0,0 +1,48 @@ + + + + Thank you for participating in this listening test. You may now exit the test environment + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + Quality + + Imperceptible + Perceptible but not annoying + Slightly annoying + Annoying + Very annoying + + + + + + + + + Quality + + Imperceptible + Perceptible but not annoying + Slightly annoying + Annoying + Very annoying + + + + + + + diff -r 0e4b84497040 -r 300bb2bbba4a tests/templates/itur1534.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/templates/itur1534.xml Tue Aug 01 15:23:47 2017 +0100 @@ -0,0 +1,48 @@ + + + + Thank you for participating in this listening test. You may now exit the test environment + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + Quality + + Imperceptible + Perceptible but not annoying + Slightly annoying + Annoying + Very annoying + + + + + + + + + Quality + + Imperceptible + Perceptible but not annoying + Slightly annoying + Annoying + Very annoying + + + + + + + diff -r 0e4b84497040 -r 300bb2bbba4a xml/test-schema.xsd --- a/xml/test-schema.xsd Thu Jul 27 21:00:36 2017 +0100 +++ b/xml/test-schema.xsd Tue Aug 01 15:23:47 2017 +0100 @@ -12,14 +12,14 @@ - + - +