Mercurial > hg > webaudioevaluationtool
comparison ape.js @ 1519:ae6c77e78494
APE: Multiple Screen proof
author | Nicholas Jillings <nickjillings@users.noreply.github.com> |
---|---|
date | Thu, 10 Sep 2015 12:53:55 +0100 |
parents | 74126eeefb53 |
children | b797a8b347d0 |
comparison
equal
deleted
inserted
replaced
1518:74126eeefb53 | 1519:ae6c77e78494 |
---|---|
505 var slider = document.getElementById('slider'); | 505 var slider = document.getElementById('slider'); |
506 var marginSize = Number(slider.attributes['marginsize'].value); | 506 var marginSize = Number(slider.attributes['marginsize'].value); |
507 var w = slider.style.width; | 507 var w = slider.style.width; |
508 w = Number(w.substr(0,w.length-2)); | 508 w = Number(w.substr(0,w.length-2)); |
509 var x = ev.x; | 509 var x = ev.x; |
510 if (x < 0) | 510 x += Math.abs(ev.view.screenLeft); |
511 { | 511 x = x % ev.view.outerWidth; |
512 x += -1.0*ev.view.screenLeft; | |
513 } | |
514 if (x >= marginSize && x < w+marginSize) { | 512 if (x >= marginSize && x < w+marginSize) { |
515 this.style.left = (x)+'px'; | 513 this.style.left = (x)+'px'; |
516 } else { | 514 } else { |
517 if (x<marginSize) { | 515 if (x<marginSize) { |
518 this.style.left = marginSize+'px'; | 516 this.style.left = marginSize+'px'; |
524 var id = Number(ev.srcElement.getAttribute('trackindex')); | 522 var id = Number(ev.srcElement.getAttribute('trackindex')); |
525 audioEngineContext.audioObjects[id].metric.moved(time,convSliderPosToRate(ev.srcElement)); | 523 audioEngineContext.audioObjects[id].metric.moved(time,convSliderPosToRate(ev.srcElement)); |
526 console.log('slider '+id+' moved to '+convSliderPosToRate(ev.srcElement)+' ('+time+')'); | 524 console.log('slider '+id+' moved to '+convSliderPosToRate(ev.srcElement)+' ('+time+')'); |
527 } | 525 } |
528 | 526 |
529 function buttonSubmitClick() // TODO: Only when all songs have been played! | 527 function buttonSubmitClick() |
530 { | 528 { |
531 var checks = testState.currentStateMap[testState.currentIndex].interfaces[0].options; | 529 var checks = testState.currentStateMap[testState.currentIndex].interfaces[0].options; |
532 var canContinue = true; | 530 var canContinue = true; |
533 | 531 |
534 // Check that the anchor and reference objects are correctly placed | 532 // Check that the anchor and reference objects are correctly placed |