Mercurial > hg > webaudioevaluationtool

changeset 2366:5586b1687088

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Tue, 17 May 2016 01:20:39 +0100
parents 95dc0833eb0a (current diff) 3cf673fb1c96 (diff)
children c341b59a99bb
files
diffstat 5 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
Binary file docs/Instructions/Instructions.pdf has changed
--- a/docs/Instructions/Instructions.tex	Mon May 16 16:20:59 2016 +0100
+++ b/docs/Instructions/Instructions.tex	Tue May 17 01:20:39 2016 +0100
@@ -206,7 +206,7 @@
 	                \end{center}
 	                \end{figure}
 
-	        Alternatively, you can simply type \texttt{python} (follwed by a space) and drag the file into the Terminal window from Finder. % DOESN'T WORK YET
+	        Alternatively, you can simply type \texttt{python} (followed by a space) and drag the file into the Terminal window from Finder. % DOESN'T WORK YET
 			
 			You can leave this running throughout the different experiments (i.e. leave the Terminal open). Once running the terminal will report the current URL to type into your browser to initiate the test, usually this is http://localhost:8000/.
 			On OSX 10.10 or newer, you may get a dialogue asking if Python can accept incomming connections, click yes.
@@ -261,17 +261,17 @@
 	        \end{center}
 	        \end{figure}
                     
-        If at any point in the test the participant reports weird behaviour or an error of some kind, or the test needs to be interrupted, please notify the experimenter and/or refer to Section~\ref{sec:troubleshooting}.
-		
-		When the test is over (the subject should see a message to that effect, and click `Submit' one last time), the output XML file containing all collected data should have appeared in `saves/'. The names of these files are `test-0.xml', `test-1.xml', etc., in ascending order. The Terminal or Command prompt running the local web server will display the following file name. If such a file did not appear, please again refer to Section~\ref{sec:troubleshooting}. 
-		
-		It is advised that you back up these results as often as possible, as a loss of this data means that the time and effort spent by the subject(s) has been in vain. Save the results to an external or network drive, and/or send them to the experimenter regularly. 
-		
-		To start the test again for a new participant, you do not need to close the browser or shut down the Terminal or Command Prompt. Simply refresh the page or go to \texttt{localhost:8000} again, a new session will be created.
+	        If at any point in the test the participant reports weird behaviour or an error of some kind, or the test needs to be interrupted, please notify the experimenter and/or refer to Section~\ref{sec:troubleshooting}.
+			
+			When the test is over (the subject should see a message to that effect), the output XML file containing all collected data should have appeared in `saves/'. The names of these files are `test-0.xml', `test-1.xml', etc., in ascending order. The Terminal or Command prompt running the local web server will display the following file name. If such a file did not appear, please again refer to Section~\ref{sec:troubleshooting}. % Is this still the case?
+			
+			It is advised that you back up these results as often as possible, as a loss of this data means that the time and effort spent by the subject(s) has been in vain. Save the results to an external or network drive, and/or send them to the experimenter regularly. 
+			
+			To start the test again for a new participant, you do not need to close the browser or shut down the Terminal or Command Prompt. Simply refresh the page or go to \texttt{localhost:8000} again, a new session will be created.
 		
 
 	\subsection{Remote test}
-		Put all files on a web server which supports PHP. This allows the `save.php' script to store the XML result files in the `saves/' folder. If the web server is not able to store the XML file there at the end of the test, it will present the XML file locally to the user, as a `Save file' link.
+		Put all files on a web server which supports PHP. This allows the `save.php' script to store the XML result files in the `saves/' folder. 
 		
 		Ensure that the \path{saves/} directory has public read-write access. On most linux servers this can be achieved using the command \texttt{sudo chmod 777 ./saves}.
 
@@ -437,8 +437,8 @@
             	\item \texttt{default}: The default by the interface (Default if undefined)
             	\item \texttt{none}: Show no labels
             	\item \texttt{number}: Show natural numbers starting at index 1
-            	\item \texttt{letter}: Show letters starting at 'a'
-            	\item \texttt{capital}: Show letters starting at 'A'
+            	\item \texttt{letter}: Show letters starting at `a'
+            	\item \texttt{capital}: Show letters starting at `A'
             \end{itemize}
             \item \texttt{poolSize}: non-negative integer, optional. Determine the number of \texttt{<audioelement>} nodes to take from those defined. For instance if \texttt{poolSize=3} and there are 4 audio elements, only 3 will actually be loaded and presented to the user.
             \item \texttt{alwaysInclude}: boolean, optional. If the parent \texttt{<setup>} node has poolSize set, you can enforce the page to always be selected by setting alwaysInclude to true. Default is false
--- a/saves/read.txt	Mon May 16 16:20:59 2016 +0100
+++ b/saves/read.txt	Tue May 17 01:20:39 2016 +0100
@@ -1,2 +1,1 @@
-This folder is where the pythonServer.py server will save the received test results
-Files will return as test-#.xml where # is the number they were received!
+This folder is where the remote PHP server (through save.php) or local server (python/pythonServer.py) will save the received test results. 
--- a/test_create/interface-specs.xml	Mon May 16 16:20:59 2016 +0100
+++ b/test_create/interface-specs.xml	Tue May 17 01:20:39 2016 +0100
@@ -21,7 +21,7 @@
             <list name="volume">Show master volume control</list>
             <list name="page-count">Show test page count</list>
             <list name="playhead">Show playhead</list>
-            <list name="comments">Show Element Comment Boxes</list>
+            <list name="comments">Show element comment boxes</list>
         </show>
     </global>
     <interfaces>
--- a/test_create/test_core.js	Mon May 16 16:20:59 2016 +0100
+++ b/test_create/test_core.js	Tue May 17 01:20:39 2016 +0100
@@ -1323,7 +1323,7 @@
             obj.content = document.createElement("div");
             obj.content.id = "finish";
             var span = document.createElement("span");
-            span.textContent = "Your XML document is linked below. On most browsers, simply right click on the link and select 'Save As'. Or clicking on the link may download the file directly."
+            span.textContent = "Your XML document is linked below. On most browsers, simply right click on the link and select 'Save As'. Or clicking on the link may download the file directly. "
             obj.content.appendChild(span);
             var link = document.createElement("div");
             link.appendChild(doc.children[0]);