diff example_eval/project.xml @ 36:d848d24fdb7c Dev_main

Shuffled project.xml so metrics and pre/post are part of setup tag. Split pre-post button interface to separate functions
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Fri, 10 Apr 2015 12:48:07 +0100
parents 5bc6e6fd2e36
children 6653aaec3650
line wrap: on
line diff
--- a/example_eval/project.xml	Fri Apr 10 12:23:57 2015 +0100
+++ b/example_eval/project.xml	Fri Apr 10 12:48:07 2015 +0100
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BrowserEvalProjectDocument>
-	<setup interface="APE" projectReturn="null" randomiseOrder='true' collectMetrics='true' />
+	<setup interface="APE" projectReturn="null" randomiseOrder='true' collectMetrics='true'>
+		<PreTest>
+			<statement>Please listen to all mixes</statement>
+			<question id="location" mandatory="true">Please enter your listening location</question>
+		</PreTest>
+		<PostTest>
+			<statement>Thank you for taking this listening test.</statement>
+			<question id="SessionID">Please enter your name.</question>
+		</PostTest>
+		<Metric>
+			<metricEnable>testTimer</metricEnable>
+			<metricEnable>elementTimer</metricEnable>
+			<metricEnable>elementTracker</metricEnable>
+			<metricEnable>elementFlagListenedTo</metricEnable>
+			<metricEnable>elementFlagMoved</metricEnable>
+		</Metric>
+	</setup>
 	<audioHolder id='0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='1'>
 		<audioElements url="0.wav" ID="0"/>
 		<audioElements url="1.wav"/>
@@ -19,19 +35,4 @@
 			<statement>Please take a break before the next test</statement>
 		</PostTest>
 	</audioHolder>
-	<PreTest>
-		<statement>Please listen to all mixes</statement>
-		<question id="location" mandatory="true">Please enter your listening location</question>
-	</PreTest>
-	<PostTest>
-		<statement>Thank you for taking this listening test.</statement>
-		<question id="SessionID">Please enter your name.</question>
-	</PostTest>
-	<Metric>
-		<metricEnable>testTimer</metricEnable>
-		<metricEnable>elementTimer</metricEnable>
-		<metricEnable>elementTracker</metricEnable>
-		<metricEnable>elementFlagListenedTo</metricEnable>
-		<metricEnable>elementFlagMoved</metricEnable>
-	</Metric>
 </BrowserEvalProjectDocument>
\ No newline at end of file