Mercurial > hg > webaudioevaluationtool
changeset 274:1077ea830706 Dev_main
Feature #1295: Page count can be displayed below the Start/Submit buttons
| author | Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk> |
|---|---|
| date | Thu, 23 Jul 2015 10:48:14 +0100 |
| parents | 1063d7132493 |
| children | 360a38cc2fc2 |
| files | ape.js core.js example_eval/project.xml |
| diffstat | 3 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ape.js Thu Jul 23 10:12:24 2015 +0100 +++ b/ape.js Thu Jul 23 10:48:14 2015 +0100 @@ -312,7 +312,17 @@ playbackHolder.appendChild(interfaceContext.playhead.object); feedbackHolder.appendChild(playbackHolder); } - break; + } else if (interfaceObj[k].options[i].type == 'option' && interfaceObj[k].options[i].name == 'page-count') + { + var pagecountHolder = document.getElementById('page-count'); + if (pagecountHolder == null) + { + pagecountHolder = document.createElement('div'); + pagecountHolder.id = 'page-count'; + } + pagecountHolder.innerHTML = '<span>Test '+(audioHolderObject.presentedId+1)+' of '+specification.audioHolders.length+'</span>'; + var inject = document.getElementById('interface-buttons'); + inject.appendChild(pagecountHolder); } } } @@ -598,7 +608,7 @@ // Store the slider marker values var holdValues = []; $(".track-slider").each(function(index,sliderObj){ - holdValues.push(convSliderPosToRate(index)); + holdValues.push(convSliderPosToRate(sliderObj)); }); var width = event.target.innerWidth;
--- a/core.js Thu Jul 23 10:12:24 2015 +0100 +++ b/core.js Thu Jul 23 10:48:14 2015 +0100 @@ -541,6 +541,10 @@ if (specification.randomiseOrder) { specification.audioHolders = randomiseOrder(specification.audioHolders); + for (var i=0; i<specification.audioHolders.length; i++) + { + specification.audioHolders[i].presentedId = i; + } } $(specification.audioHolders).each(function(index,elem){ @@ -1460,6 +1464,7 @@ this.audioHolderNode = function(parent,xml) { this.type = 'audioHolder'; + this.presentedId = parent.audioHolders.length; this.interfaceNode = function(DOM) { var title = DOM.getElementsByTagName('title'); if (title.length == 0) {this.title = null;}
--- a/example_eval/project.xml Thu Jul 23 10:12:24 2015 +0100 +++ b/example_eval/project.xml Thu Jul 23 10:48:14 2015 +0100 @@ -41,6 +41,7 @@ <check name="fragmentComments"/>--> <check name="scalerange" min="25" max="75"/> <option name='playhead'/> + <option name="page-count"/> <anchor enforce="false">40</anchor> </interface> </setup>