Mercurial > hg > webaudioevaluationtool
comparison interfaces/ape.js @ 2284:29e754aca00f
Stable fix for #22
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Fri, 22 Apr 2016 09:52:28 +0100 |
parents | 2424a77a7c56 |
children | e59327ebdb15 |
comparison
equal
deleted
inserted
replaced
2283:169f08dc9634 | 2284:29e754aca00f |
---|---|
26 if (hasBeenPlayed.length > 0) // if a fragment has not been played yet | 26 if (hasBeenPlayed.length > 0) // if a fragment has not been played yet |
27 { | 27 { |
28 str = ""; | 28 str = ""; |
29 if (hasBeenPlayed.length > 1) { | 29 if (hasBeenPlayed.length > 1) { |
30 for (var i=0; i<hasBeenPlayed.length; i++) { | 30 for (var i=0; i<hasBeenPlayed.length; i++) { |
31 str = str + (hasBeenPlayed[i]+1); // start from 1 | 31 var ao_id = audioEngineContext.audioObjects[hasBeenPlayed[i]].interfaceDOM.getPresentedId(); |
32 str = str + ao_id; // start from 1 | |
32 if (i < hasBeenPlayed.length-2){ | 33 if (i < hasBeenPlayed.length-2){ |
33 str += ", "; | 34 str += ", "; |
34 } else if (i == hasBeenPlayed.length-2) { | 35 } else if (i == hasBeenPlayed.length-2) { |
35 str += " or "; | 36 str += " or "; |
36 } | 37 } |
37 } | 38 } |
38 alert('You have not played fragments ' + str + ' yet. Please listen, rate and comment all samples before submitting.'); | 39 alert('You have not played fragments ' + str + ' yet. Please listen, rate and comment all samples before submitting.'); |
39 } else { | 40 } else { |
40 alert('You have not played fragment ' + (hasBeenPlayed[0]+1) + ' yet. Please listen, rate and comment all samples before submitting.'); | 41 alert('You have not played fragment ' + (audioEngineContext.audioObjects[hasBeenPlayed[0]].interfaceDOM.getPresentedId()) + ' yet. Please listen, rate and comment all samples before submitting.'); |
41 } | 42 } |
42 return false; | 43 return false; |
43 } | 44 } |
44 return true; | 45 return true; |
45 }; | 46 }; |
66 } else { | 67 } else { |
67 str += 'On axis "'+interfaceName+'" you must move '; | 68 str += 'On axis "'+interfaceName+'" you must move '; |
68 } | 69 } |
69 if (interfaceTID.length == 1) | 70 if (interfaceTID.length == 1) |
70 { | 71 { |
71 str += 'slider '+(interfaceTID[0]+1)+'. '; // start from 1 | 72 str += 'slider '+(audioEngineContext.audioObjects[interfaceTID[0]].interfaceDOM.getPresentedId())+'. '; // start from 1 |
72 } | 73 } |
73 else { | 74 else { |
74 str += 'sliders '; | 75 str += 'sliders '; |
75 for (var k=0; k<interfaceTID.length-1; k++) | 76 for (var k=0; k<interfaceTID.length-1; k++) |
76 { | 77 { |
77 str += (interfaceTID[k]+1)+', '; // start from 1 | 78 str += (audioEngineContext.audioObjects[interfaceTID[k]].interfaceDOM.getPresentedId())+', '; // start from 1 |
78 } | 79 } |
79 str += (interfaceTID[interfaceTID.length-1]+1) +'. '; | 80 str += (audioEngineContext.audioObjects[interfaceTID[interfaceTID.length-1]].interfaceDOM.getPresentedId()) +'. '; |
80 } | 81 } |
81 } | 82 } |
82 } | 83 } |
83 if (state != true) | 84 if (state != true) |
84 { | 85 { |
103 } | 104 } |
104 if (state == false) { | 105 if (state == false) { |
105 if (strNums.length > 1) { | 106 if (strNums.length > 1) { |
106 var str = ""; | 107 var str = ""; |
107 for (var i=0; i<strNums.length; i++) { | 108 for (var i=0; i<strNums.length; i++) { |
108 str = str + (strNums[i]+1); // start from 1 | 109 var ao_id = audioEngineContext.audioObjects[strNums[i]].interfaceDOM.getPresentedId(); |
110 str = str + (ao_id); // start from 1 | |
109 if (i < strNums.length-2){ | 111 if (i < strNums.length-2){ |
110 str += ", "; | 112 str += ", "; |
111 } else if (i == strNums.length-2) { | 113 } else if (i == strNums.length-2) { |
112 str += " or "; | 114 str += " or "; |
113 } | 115 } |
114 } | 116 } |
115 alert('You have not commented on fragments ' + str + ' yet. Please listen, rate and comment all samples before submitting.'); | 117 alert('You have not commented on fragments ' + str + ' yet. Please listen, rate and comment all samples before submitting.'); |
116 } else { | 118 } else { |
117 alert('You have not commented on fragment ' + (strNums[0]+1) + ' yet. Please listen, rate and comment all samples before submitting.'); | 119 alert('You have not commented on fragment ' + (audioEngineContext.audioObjects[strNums[0]].interfaceDOM.getPresentedId()) + ' yet. Please listen, rate and comment all samples before submitting.'); |
118 } | 120 } |
119 } | 121 } |
120 } | 122 } |
121 return state; | 123 return state; |
122 }; | 124 }; |