Mercurial > hg > webaudioevaluationtool
changeset 2295:c63df53cbd10
Merge branch 'Dev_main'
| author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
|---|---|
| date | Wed, 27 Apr 2016 09:39:12 +0100 |
| parents | fd711d12dd14 (diff) 5a2aaa964f6d (current diff) |
| children | 9cf65a9360d2 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Wed Apr 27 09:38:45 2016 +0100 +++ b/index.html Wed Apr 27 09:39:12 2016 +0100 @@ -56,7 +56,7 @@ <li><a href="index.html?url=example_eval/AB_example.xml" target="_blank">AB interface test example</a></li> <li><a href="index.html?url=example_eval/horizontal_example.xml" target="_blank">Horizontal interface test example</a></li> <li><a href="index.html?url=example_eval/radio_example.xml" target="_blank">Radio interface test example</a></li> - <li><a href="test_create/test_create.html" target="_blank">Test creator</a></li> + <li><a href="test_create.html" target="_blank">Test creator</a></li> <li><a href="analyse.html" target="_blank">Analysis and diagnostics of results</a></li> </ul> <br>
--- a/interfaces/ABX.js Wed Apr 27 09:38:45 2016 +0100 +++ b/interfaces/ABX.js Wed Apr 27 09:39:12 2016 +0100 @@ -206,17 +206,17 @@ interfaceContext.comparator.selected = id; if ($(event.currentTarget).hasClass("selected")) { $(".comparator-selector").removeClass('selected'); - for (var i=0; i<interfaceContext.comparator.comparators.length; i++) + for (var i=0; i<interfaceContext.comparator.pair.length; i++) { - var obj = interfaceContext.comparator.comparators[i]; + var obj = interfaceContext.comparator.pair[i]; obj.parent.metric.moved(time,0); } } else { $(".comparator-selector").removeClass('selected'); $(event.currentTarget).addClass('selected'); - for (var i=0; i<interfaceContext.comparator.comparators.length; i++) + for (var i=0; i<interfaceContext.comparator.pair.length; i++) { - var obj = interfaceContext.comparator.comparators[i]; + var obj = interfaceContext.comparator.pair[i]; if (i == id) { obj.value = 1; } else { @@ -346,7 +346,7 @@ this.boxHolders.appendChild(node.box); } var elementId = Math.floor(Math.random() * 2); //Randomly pick A or B to be X - var element = new page.audioElementNode(); + var element = new page.audioElementNode(specification); for (var atr in page.audioElements[elementId]) { eval("element."+atr+" = page.audioElements[elementId]."+atr); }