Mercurial > hg > webaudioevaluationtool

changeset 187:51b004c6d762 Dev_main

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
audioHolder ID's are stored
author Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk>
date Fri, 05 Jun 2015 11:32:09 +0100
parents aad4f492ffda
children 8a5d6a5f0604
files core.js example_eval/project.xml
diffstat 2 files changed, 43 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/core.js	Fri Jun 05 11:25:56 2015 +0100
+++ b/core.js	Fri Jun 05 11:32:09 2015 +0100
@@ -207,6 +207,9 @@
 			for (var id=0; id<this.stateMap.length; id++){
 				var name = this.stateMap[id].type;
 				var obj = document.createElement(name);
+				if (name == 'audioHolder') {
+					obj.id = this.stateMap[id].id;
+				}
 				this.stateResults.push(obj);
 			}
 		} else {
--- a/example_eval/project.xml	Fri Jun 05 11:25:56 2015 +0100
+++ b/example_eval/project.xml	Fri Jun 05 11:32:09 2015 +0100
@@ -34,17 +34,50 @@
 		<audioElements url="3.wav" id="3"/>
 		<audioElements url="4.wav" id="4"/>
 		<audioElements url="5.wav" id="5"/>
-		<!--<audioElements url="6.wav" id="6"/>
+		<audioElements url="6.wav" id="6"/>
 		<audioElements url="7.wav" id="7"/>
 		<audioElements url="8.wav" id="8"/>
 		<audioElements url="9.wav" id="9"/>
-		<audioElements url="10.wav" id="10"/>-->
+		<audioElements url="10.wav" id="10"/>
 		<CommentQuestion id='mixingExperience'>What is your mixing experience</CommentQuestion>
-		<!--
-		<PreTest>
-			<statement>Start the Test 3</statement>
-		</PreTest>
-		-->
+		<PostTest>
+			<question id="genre" mandatory="true">Please enter the genre</question>
+		</PostTest>
+	</audioHolder>
+	<audioHolder id='1' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='0' loop='true' elementComments='true'>
+		<interface>
+			<title>Example Test Question</title>
+			<scale position="0">Min</scale>
+			<scale position="100">Max</scale>
+			<scale position="50">Middle</scale>
+			<scale position="20">20</scale>
+			<commentBoxPrefix>Comment on fragment</commentBoxPrefix>
+		</interface>
+		<audioElements url="0.wav" id="0"/>
+		<audioElements url="1.wav" id="1"/>
+		<audioElements url="2.wav" id="2"/>
+		<audioElements url="3.wav" id="3"/>
+		<CommentQuestion id='mixingExperience'>What is your mixing experience</CommentQuestion>
+		<PostTest>
+			<question id="genre" mandatory="true">Please enter the genre</question>
+		</PostTest>
+	</audioHolder>
+	<audioHolder id='2' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='0' loop='true' elementComments='true'>
+		<interface>
+			<title>Example Test Question</title>
+			<scale position="0">Min</scale>
+			<scale position="100">Max</scale>
+			<scale position="50">Middle</scale>
+			<scale position="20">20</scale>
+			<commentBoxPrefix>Comment on fragment</commentBoxPrefix>
+		</interface>
+		<audioElements url="0.wav" id="0"/>
+		<audioElements url="1.wav" id="1"/>
+		<audioElements url="2.wav" id="2"/>
+		<audioElements url="3.wav" id="3"/>
+		<audioElements url="4.wav" id="4"/>
+		<audioElements url="5.wav" id="5"/>
+		<CommentQuestion id='mixingExperience'>What is your mixing experience</CommentQuestion>
 		<PostTest>
 			<question id="genre" mandatory="true">Please enter the genre</question>
 		</PostTest>