# HG changeset patch # User Nicholas Jillings # Date 1464347802 -3600 # Node ID 3013cf94571676a4e8bf36258b227dfbbd04cf4f # Parent b7ed9d43ea873124d9b4e70df6474ba06548a038# Parent dd8894bca6914d9feed13063e03ea9591f3031b5 Merge branch 'Dev_main' diff -r dd8894bca691 -r 3013cf945716 interfaces/AB.js --- a/interfaces/AB.js Fri May 27 11:52:07 2016 +0100 +++ b/interfaces/AB.js Fri May 27 12:16:42 2016 +0100 @@ -153,6 +153,9 @@ if (node){feedbackHolder.removeChild(node);} } + // Populate the comparator object + interfaceContext.comparator = new comparator(audioHolderObject); + for (var option of interfaceOptions) { if (option.type == "show") @@ -187,30 +190,27 @@ feedbackHolder.appendChild(interfaceContext.volume.object); } break; + case "comments": + var commentHolder = document.createElement('div'); + commentHolder.id = 'commentHolder'; + document.getElementById('testContent').appendChild(commentHolder); + // Generate one comment box per presented page + for (var element of audioEngineContext.audioObjects) + { + interfaceContext.commentBoxes.createCommentBox(element); + } + interfaceContext.commentBoxes.showCommentBoxes(commentHolder,true); + break; } } } - - // Populate the comparator object - interfaceContext.comparator = new comparator(audioHolderObject); - if (audioHolderObject.showElementComments) - { - var commentHolder = document.createElement('div'); - commentHolder.id = 'commentHolder'; - document.getElementById('testContent').appendChild(commentHolder); - // Generate one comment box per presented page - for (var element of audioEngineContext.audioObjects) - { - interfaceContext.commentBoxes.createCommentBox(element); - } - interfaceContext.commentBoxes.showCommentBoxes(commentHolder,true); - } - resizeWindow(null); $(audioHolderObject.commentQuestions).each(function(index,element) { var node = interfaceContext.createCommentQuestion(element); commentHolder.appendChild(node.holder); }); + + resizeWindow(null); } function comparator(audioHolderObject) diff -r dd8894bca691 -r 3013cf945716 interfaces/ape.js --- a/interfaces/ape.js Fri May 27 11:52:07 2016 +0100 +++ b/interfaces/ape.js Fri May 27 12:16:42 2016 +0100 @@ -339,6 +339,12 @@ { feedbackHolder.appendChild(interfaceContext.volume.object); } + } else if (interfaceList[k].options[i].type == 'show' && interfaceList[k].options[i].name == 'comments') { + var commentHolder = document.createElement('div'); + commentHolder.id = 'commentHolder'; + document.getElementById('testContent').appendChild(commentHolder); + interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); + break; } } } @@ -444,17 +450,51 @@ interfaceContext.releaseObject(); }); - - if (audioHolderObject.showElementComments) { - interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); - } - - $(audioHolderObject.commentQuestions).each(function(index,element) { + var interfaceList = audioHolderObject.interfaces.concat(specification.interfaces); + for (var k=0; k'; + var inject = document.getElementById('interface-buttons'); + inject.appendChild(pagecountHolder); + } else if (interfaceList[k].options[i].type == 'show' && interfaceList[k].options[i].name == 'volume') { + if (document.getElementById('master-volume-holder') == null) + { + feedbackHolder.appendChild(interfaceContext.volume.object); + } + } else if (interfaceList[k].options[i].type == 'show' && interfaceList[k].options[i].name == 'comments') { + interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); + break; + } + } + } + + $(audioHolderObject.commentQuestions).each(function(index,element) { var node = interfaceContext.createCommentQuestion(element); feedbackHolder.appendChild(node.holder); }); - //testWaitIndicator(); } diff -r dd8894bca691 -r 3013cf945716 interfaces/discrete.js --- a/interfaces/discrete.js Fri May 27 11:52:07 2016 +0100 +++ b/interfaces/discrete.js Fri May 27 12:16:42 2016 +0100 @@ -130,44 +130,6 @@ { document.getElementById("pageTitle").textContent = interfaceObj.title; } - - var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); - for (var option of interfaceOptions) - { - if (option.type == "show") - { - switch(option.name) { - case "playhead": - var playbackHolder = document.getElementById('playback-holder'); - if (playbackHolder == null) - { - playbackHolder = document.createElement('div'); - playbackHolder.style.width = "100%"; - playbackHolder.align = 'center'; - playbackHolder.appendChild(interfaceContext.playhead.object); - feedbackHolder.appendChild(playbackHolder); - } - break; - case "page-count": - var pagecountHolder = document.getElementById('page-count'); - if (pagecountHolder == null) - { - pagecountHolder = document.createElement('div'); - pagecountHolder.id = 'page-count'; - } - pagecountHolder.innerHTML = 'Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+''; - var inject = document.getElementById('interface-buttons'); - inject.appendChild(pagecountHolder); - break; - case "volume": - if (document.getElementById('master-volume-holder') == null) - { - feedbackHolder.appendChild(interfaceContext.volume.object); - } - break; - } - } - } // Delete outside reference document.getElementById("outside-reference-holder").innerHTML = ""; @@ -224,11 +186,52 @@ }); - if (page.showElementComments) + var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); + for (var option of interfaceOptions) { - interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); + if (option.type == "show") + { + switch(option.name) { + case "playhead": + var playbackHolder = document.getElementById('playback-holder'); + if (playbackHolder == null) + { + playbackHolder = document.createElement('div'); + playbackHolder.style.width = "100%"; + playbackHolder.align = 'center'; + playbackHolder.appendChild(interfaceContext.playhead.object); + feedbackHolder.appendChild(playbackHolder); + } + break; + case "page-count": + var pagecountHolder = document.getElementById('page-count'); + if (pagecountHolder == null) + { + pagecountHolder = document.createElement('div'); + pagecountHolder.id = 'page-count'; + } + pagecountHolder.innerHTML = 'Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+''; + var inject = document.getElementById('interface-buttons'); + inject.appendChild(pagecountHolder); + break; + case "volume": + if (document.getElementById('master-volume-holder') == null) + { + feedbackHolder.appendChild(interfaceContext.volume.object); + } + break; + case "comments": + interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); + break; + } + } } + $(page.commentQuestions).each(function(index,element) { + var node = interfaceContext.createCommentQuestion(element); + commentHolder.appendChild(node.holder); + }); + // Auto-align resizeWindow(null); } diff -r dd8894bca691 -r 3013cf945716 interfaces/horizontal-sliders.js --- a/interfaces/horizontal-sliders.js Fri May 27 11:52:07 2016 +0100 +++ b/interfaces/horizontal-sliders.js Fri May 27 12:16:42 2016 +0100 @@ -130,44 +130,6 @@ { document.getElementById("pageTitle").textContent = interfaceObj.title; } - - var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); - for (var option of interfaceOptions) - { - if (option.type == "show") - { - switch(option.name) { - case "playhead": - var playbackHolder = document.getElementById('playback-holder'); - if (playbackHolder == null) - { - playbackHolder = document.createElement('div'); - playbackHolder.style.width = "100%"; - playbackHolder.align = 'center'; - playbackHolder.appendChild(interfaceContext.playhead.object); - feedbackHolder.appendChild(playbackHolder); - } - break; - case "page-count": - var pagecountHolder = document.getElementById('page-count'); - if (pagecountHolder == null) - { - pagecountHolder = document.createElement('div'); - pagecountHolder.id = 'page-count'; - } - pagecountHolder.innerHTML = 'Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+''; - var inject = document.getElementById('interface-buttons'); - inject.appendChild(pagecountHolder); - break; - case "volume": - if (document.getElementById('master-volume-holder') == null) - { - feedbackHolder.appendChild(interfaceContext.volume.object); - } - break; - } - } - } // Delete outside reference document.getElementById("outside-reference-holder").innerHTML = ""; @@ -231,9 +193,45 @@ } }); - if (page.showElementComments) + var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); + for (var option of interfaceOptions) { - interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); + if (option.type == "show") + { + switch(option.name) { + case "playhead": + var playbackHolder = document.getElementById('playback-holder'); + if (playbackHolder == null) + { + playbackHolder = document.createElement('div'); + playbackHolder.style.width = "100%"; + playbackHolder.align = 'center'; + playbackHolder.appendChild(interfaceContext.playhead.object); + feedbackHolder.appendChild(playbackHolder); + } + break; + case "page-count": + var pagecountHolder = document.getElementById('page-count'); + if (pagecountHolder == null) + { + pagecountHolder = document.createElement('div'); + pagecountHolder.id = 'page-count'; + } + pagecountHolder.innerHTML = 'Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+''; + var inject = document.getElementById('interface-buttons'); + inject.appendChild(pagecountHolder); + break; + case "volume": + if (document.getElementById('master-volume-holder') == null) + { + feedbackHolder.appendChild(interfaceContext.volume.object); + } + break; + case "comments": + interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); + break; + } + } } // Auto-align resizeWindow(null); diff -r dd8894bca691 -r 3013cf945716 interfaces/mushra.js --- a/interfaces/mushra.js Fri May 27 11:52:07 2016 +0100 +++ b/interfaces/mushra.js Fri May 27 12:16:42 2016 +0100 @@ -131,43 +131,6 @@ { document.getElementById("pageTitle").textContent = interfaceObj.title; } - var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); - for (var option of interfaceOptions) - { - if (option.type == "show") - { - switch(option.name) { - case "playhead": - var playbackHolder = document.getElementById('playback-holder'); - if (playbackHolder == null) - { - playbackHolder = document.createElement('div'); - playbackHolder.style.width = "100%"; - playbackHolder.align = 'center'; - playbackHolder.appendChild(interfaceContext.playhead.object); - feedbackHolder.appendChild(playbackHolder); - } - break; - case "page-count": - var pagecountHolder = document.getElementById('page-count'); - if (pagecountHolder == null) - { - pagecountHolder = document.createElement('div'); - pagecountHolder.id = 'page-count'; - } - pagecountHolder.innerHTML = 'Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+''; - var inject = document.getElementById('interface-buttons'); - inject.appendChild(pagecountHolder); - break; - case "volume": - if (document.getElementById('master-volume-holder') == null) - { - feedbackHolder.appendChild(interfaceContext.volume.object); - } - break; - } - } - } // Delete outside reference var outsideReferenceHolder = document.getElementById("outside-reference-holder"); @@ -232,9 +195,47 @@ }); - if (audioHolderObject.showElementComments) { - interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); - } + + var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); + for (var option of interfaceOptions) + { + if (option.type == "show") + { + switch(option.name) { + case "playhead": + var playbackHolder = document.getElementById('playback-holder'); + if (playbackHolder == null) + { + playbackHolder = document.createElement('div'); + playbackHolder.style.width = "100%"; + playbackHolder.align = 'center'; + playbackHolder.appendChild(interfaceContext.playhead.object); + feedbackHolder.appendChild(playbackHolder); + } + break; + case "page-count": + var pagecountHolder = document.getElementById('page-count'); + if (pagecountHolder == null) + { + pagecountHolder = document.createElement('div'); + pagecountHolder.id = 'page-count'; + } + pagecountHolder.innerHTML = 'Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+''; + var inject = document.getElementById('interface-buttons'); + inject.appendChild(pagecountHolder); + break; + case "volume": + if (document.getElementById('master-volume-holder') == null) + { + feedbackHolder.appendChild(interfaceContext.volume.object); + } + break; + case "comments": + interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder,true); + break; + } + } + } $(audioHolderObject.commentQuestions).each(function(index,element) { var node = interfaceContext.createCommentQuestion(element); diff -r dd8894bca691 -r 3013cf945716 js/specification.js --- a/js/specification.js Fri May 27 11:52:07 2016 +0100 +++ b/js/specification.js Fri May 27 12:16:42 2016 +0100 @@ -442,7 +442,6 @@ this.hostURL = undefined; this.randomiseOrder = undefined; this.loop = undefined; - this.showElementComments = undefined; this.outsideReference = null; this.loudness = null; this.label = null; diff -r dd8894bca691 -r 3013cf945716 tests/examples/AB_example.xml --- a/tests/examples/AB_example.xml Fri May 27 11:52:07 2016 +0100 +++ b/tests/examples/AB_example.xml Fri May 27 12:16:42 2016 +0100 @@ -50,9 +50,10 @@ + - + Comment on fragment Depth @@ -70,7 +71,7 @@ - + Comment on fragment Depth diff -r dd8894bca691 -r 3013cf945716 tests/examples/horizontal_example.xml --- a/tests/examples/horizontal_example.xml Fri May 27 11:52:07 2016 +0100 +++ b/tests/examples/horizontal_example.xml Fri May 27 12:16:42 2016 +0100 @@ -16,9 +16,10 @@ + - + -50 diff -r dd8894bca691 -r 3013cf945716 tests/examples/mushra_example.xml --- a/tests/examples/mushra_example.xml Fri May 27 11:52:07 2016 +0100 +++ b/tests/examples/mushra_example.xml Fri May 27 12:16:42 2016 +0100 @@ -53,7 +53,7 @@ - + Comment on fragment @@ -82,10 +82,11 @@ - + Comment on fragment Example Test Question + Min Max diff -r dd8894bca691 -r 3013cf945716 tests/examples/project.xml --- a/tests/examples/project.xml Fri May 27 11:52:07 2016 +0100 +++ b/tests/examples/project.xml Fri May 27 12:16:42 2016 +0100 @@ -50,9 +50,10 @@ + - + Comment on fragment Preference @@ -88,7 +89,7 @@ - + Comment on fragment Example Test Question diff -r dd8894bca691 -r 3013cf945716 tests/examples/radio_example.xml --- a/tests/examples/radio_example.xml Fri May 27 11:52:07 2016 +0100 +++ b/tests/examples/radio_example.xml Fri May 27 12:16:42 2016 +0100 @@ -1,47 +1,37 @@ - - + + - - testTimer - elementTimer - elementInitialPosition - elementTracker - elementFlagListenedTo - elementFlagMoved - elementListenTracker - - - - - - - - - - - - - (1) Very Annoying - (2) Annoying - (3) Slightly Annoying - (4) Audible but not Annoying - (5) Inaudible - - - - - - - - - - - - - - - - - - - + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + + + + + + + (1) Very Annoying + (2) Annoying + (3) Slightly Annoying + (4) Audible but not Annoying + (5) Inaudible + + + + + + + +