changeset 1000:0dbb90fa6e90

Bug #1257: Made initialiseTest more robust
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Fri, 29 May 2015 12:38:26 +0100
parents ffeef0ac7a5f
children 20823d1467b1
files ape.js example_eval/project.xml
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ape.js	Fri May 29 12:07:08 2015 +0100
+++ b/ape.js	Fri May 29 12:38:26 2015 +0100
@@ -431,9 +431,10 @@
 		trackSliderObj.className = 'track-slider';
 		trackSliderObj.id = 'track-slider-'+index;
 		// Distribute it randomnly
-		var w = window.innerWidth - 100;
+		var w = window.innerWidth - (offset+8)*2;
 		w = Math.random()*w;
-		trackSliderObj.style.left = Math.floor(w)+50+'px';
+		w = Math.floor(w+(offset+8));
+		trackSliderObj.style.left = w+'px';
 		trackSliderObj.innerHTML = '<span>'+index+'</span>';
 		trackSliderObj.draggable = true;
 		trackSliderObj.ondragend = dragEnd;
@@ -467,6 +468,7 @@
 		};
 		
 		canvas.appendChild(trackSliderObj);
+		audioEngineContext.audioObjects[index].metric.initialised(convSliderPosToRate(index));
         
 	});
 	
--- a/example_eval/project.xml	Fri May 29 12:07:08 2015 +0100
+++ b/example_eval/project.xml	Fri May 29 12:38:26 2015 +0100
@@ -18,7 +18,7 @@
 			<metricEnable>elementFlagMoved</metricEnable>
 		</Metric>
 	</setup>
-	<audioHolder id='0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='0' loop='true' elementComments='true'>
+	<audioHolder id='0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='0' loop='false' elementComments='true'>
 		<interface>
 			<title>Example Test Question</title>
 			<scale position="0">Min</scale>