Mercurial > hg > webaudioevaluationtool
comparison interfaces/ABX.js @ 2929:270f20b2d68f
Fix #223
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Mon, 11 Sep 2017 16:14:05 +0100 |
parents | 796daa52e3f8 |
children | 0dd44ca5d062 |
comparison
equal
deleted
inserted
replaced
2927:796daa52e3f8 | 2929:270f20b2d68f |
---|---|
370 this.pair = []; | 370 this.pair = []; |
371 this.X = null; | 371 this.X = null; |
372 this.boxHolders = document.getElementById('box-holders'); | 372 this.boxHolders = document.getElementById('box-holders'); |
373 var node; | 373 var node; |
374 page.audioElements.forEach(function (element, index) { | 374 page.audioElements.forEach(function (element, index) { |
375 if (element.type != 'normal') { | 375 if (element.type != 'normal' && element.type != "reference") { |
376 console.log("WARNING - ABX can only have normal elements. Page " + page.id + ", Element " + element.id); | 376 console.log("WARNING - ABX can only have normal or reference elements. Page " + page.id + ", Element " + element.id); |
377 element.type = "normal"; | 377 element.type = "normal"; |
378 } | 378 } |
379 node = buildElement.call(this, index, audioEngineContext.newTrack(element)); | 379 node = buildElement.call(this, index, audioEngineContext.newTrack(element)); |
380 this.pair.push(node); | 380 this.pair.push(node); |
381 this.boxHolders.appendChild(node.box); | 381 this.boxHolders.appendChild(node.box); |
382 }, this); | 382 }, this); |
383 var elementId = Math.floor(Math.random() * 2); //Randomly pick A or B to be X | 383 // var elementId = Math.floor(Math.random() * 2); //Randomly pick A or B to be X |
384 var elementId = page.audioElements.findIndex(function (a) { | |
385 return a.type == "reference"; | |
386 }); | |
387 if (elementId == -1) { | |
388 elementId = Math.floor(Math.random() * 2); | |
389 console.log("No defined 'X' given. Selecting element id " + page.audioElements[elementId].id); | |
390 } | |
384 var element = page.addAudioElement(); | 391 var element = page.addAudioElement(); |
385 for (var atr in page.audioElements[elementId]) { | 392 for (var atr in page.audioElements[elementId]) { |
386 element[atr] = page.audioElements[elementId][atr]; | 393 element[atr] = page.audioElements[elementId][atr]; |
387 } | 394 } |
388 element.id += "-X"; | 395 element.id += "-X"; |