Mercurial > hg > webaudioevaluationtool
changeset 2790:cae61c5bbed1
Completed #133
| author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
|---|---|
| date | Sat, 22 Apr 2017 17:56:18 +0100 |
| parents | 3c14e0b6c9ff |
| children | 02d22f2875ca |
| files | interfaces/AB.js interfaces/ABX.js interfaces/ape.js interfaces/discrete.js interfaces/horizontal-sliders.js interfaces/mushra.js interfaces/timeline.js |
| diffstat | 7 files changed, 31 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/interfaces/AB.js Sat Apr 22 17:53:51 2017 +0100 +++ b/interfaces/AB.js Sat Apr 22 17:56:18 2017 +0100 @@ -395,35 +395,35 @@ switch (checks[i].name) { case 'fragmentPlayed': // Check if all fragments have been played - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); if (checkState === false) { canContinue = false; } break; case 'fragmentFullPlayback': // Check all fragments have been played to their full length - checkState = interfaceContext.checkFragmentsFullyPlayed(); + checkState = interfaceContext.checkFragmentsFullyPlayed(checks[i].errorMessage); if (checkState === false) { canContinue = false; } break; case 'fragmentMoved': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllMoved(); + checkState = interfaceContext.checkAllMoved(checks[i].errorMessage); if (checkState === false) { canContinue = false; } break; case 'fragmentComments': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllCommented(); + checkState = interfaceContext.checkAllCommented(checks[i].errorMessage); if (checkState === false) { canContinue = false; } break; case 'scalerange': // Check the scale has been used effectively - checkState = interfaceContext.checkScaleRange(); + checkState = interfaceContext.checkScaleRange(checks[i].errorMessage); if (checkState === false) { canContinue = false; }
--- a/interfaces/ABX.js Sat Apr 22 17:53:51 2017 +0100 +++ b/interfaces/ABX.js Sat Apr 22 17:56:18 2017 +0100 @@ -422,16 +422,16 @@ switch (checks[i].name) { case 'fragmentPlayed': // Check if all fragments have been played - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); break; case 'fragmentFullPlayback': // Check all fragments have been played to their full length - checkState = interfaceContext.checkFragmentsFullyPlayed(); + checkState = interfaceContext.checkFragmentsFullyPlayed(checks[i].errorMessage); break; case 'fragmentMoved': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllMoved(); + checkState = interfaceContext.checkAllMoved(checks[i].errorMessage); break; case 'fragmentComments': // Check all fragment sliders have been moved.
--- a/interfaces/ape.js Sat Apr 22 17:53:51 2017 +0100 +++ b/interfaces/ape.js Sat Apr 22 17:56:18 2017 +0100 @@ -738,23 +738,23 @@ switch (checks[i].name) { case 'fragmentPlayed': // Check if all fragments have been played - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); break; case 'fragmentFullPlayback': // Check all fragments have been played to their full length - checkState = interfaceContext.checkFragmentsFullyPlayed(); + checkState = interfaceContext.checkFragmentsFullyPlayed(checks[i].errorMessage); break; case 'fragmentMoved': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllMoved(); + checkState = interfaceContext.checkAllMoved(checks[i].errorMessage); break; case 'fragmentComments': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllCommented(); + checkState = interfaceContext.checkAllCommented(checks[i].errorMessage); break; case 'scalerange': // Check the scale is used to its full width outlined by the node - checkState = interfaceContext.checkScaleRange(); + checkState = interfaceContext.checkScaleRange(checks[i].errorMessage); break; default: console.log("WARNING - Check option " + checks[i].name + " is not supported on this interface");
--- a/interfaces/discrete.js Sat Apr 22 17:53:51 2017 +0100 +++ b/interfaces/discrete.js Sat Apr 22 17:56:18 2017 +0100 @@ -479,24 +479,24 @@ switch (checks[i].name) { case 'fragmentPlayed': // Check if all fragments have been played - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); break; case 'fragmentFullPlayback': // Check all fragments have been played to their full length - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); console.log('NOTE: fragmentFullPlayback not currently implemented, performing check fragmentPlayed instead'); break; case 'fragmentMoved': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllMoved(); + checkState = interfaceContext.checkAllMoved(checks[i].errorMessage); break; case 'fragmentComments': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllCommented(); + checkState = interfaceContext.checkAllCommented(checks[i].errorMessage); break; case 'scalerange': // Check the scale has been used effectively - checkState = interfaceContext.checkScaleRange(checks[i].min, checks[i].max); + checkState = interfaceContext.checkScaleRange(checks[i].errorMessage); break; default: console.log("WARNING - Check option " + checks[i].check + " is not supported on this interface");
--- a/interfaces/horizontal-sliders.js Sat Apr 22 17:53:51 2017 +0100 +++ b/interfaces/horizontal-sliders.js Sat Apr 22 17:56:18 2017 +0100 @@ -425,24 +425,24 @@ switch (checks[i].name) { case 'fragmentPlayed': // Check if all fragments have been played - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); break; case 'fragmentFullPlayback': // Check all fragments have been played to their full length - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); console.log('NOTE: fragmentFullPlayback not currently implemented, performing check fragmentPlayed instead'); break; case 'fragmentMoved': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllMoved(); + checkState = interfaceContext.checkAllMoved(checks[i].errorMessage); break; case 'fragmentComments': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllCommented(); + checkState = interfaceContext.checkAllCommented(checks[i].errorMessage); break; case 'scalerange': // Check the scale has been used effectively - checkState = interfaceContext.checkScaleRange(checks[i].min, checks[i].max); + checkState = interfaceContext.checkScaleRange(checks[i].errorMessage); break; default:
--- a/interfaces/mushra.js Sat Apr 22 17:53:51 2017 +0100 +++ b/interfaces/mushra.js Sat Apr 22 17:56:18 2017 +0100 @@ -489,24 +489,24 @@ switch (checks[i].name) { case 'fragmentPlayed': // Check if all fragments have been played - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); break; case 'fragmentFullPlayback': // Check all fragments have been played to their full length - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); console.log('NOTE: fragmentFullPlayback not currently implemented, performing check fragmentPlayed instead'); break; case 'fragmentMoved': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllMoved(); + checkState = interfaceContext.checkAllMoved(checks[i].errorMessage); break; case 'fragmentComments': // Check all fragment sliders have been moved. - checkState = interfaceContext.checkAllCommented(); + checkState = interfaceContext.checkAllCommented(checks[i].errorMessage); break; case 'scalerange': // Check the scale has been used effectively - checkState = interfaceContext.checkScaleRange(checks[i].min, checks[i].max); + checkState = interfaceContext.checkScaleRange(checks[i].errorMessage); break; default: console.log("WARNING - Check option " + checks[i].check + " is not supported on this interface");
--- a/interfaces/timeline.js Sat Apr 22 17:53:51 2017 +0100 +++ b/interfaces/timeline.js Sat Apr 22 17:56:18 2017 +0100 @@ -489,14 +489,14 @@ switch (checks[i].name) { case 'fragmentPlayed': //Check if all fragments have been played - checkState = interfaceContext.checkAllPlayed(); + checkState = interfaceContext.checkAllPlayed(checks[i].errorMessage); break; case 'fragmentFullPlayback': //Check if all fragments have played to their full length - checkState = interfaceContext.checkFragmentsFullyPlayed(); + checkState = interfaceContext.checkFragmentsFullyPlayed(checks[i].errorMessage); break; case 'fragmentComments': - checkState = interfaceContext.checkAllCommented(); + checkState = interfaceContext.checkAllCommented(checks[i].errorMessage); break; default: console.log("WARNING - Check option " + checks[i].check + " is not supported on this interface");