Mercurial > hg > webaudioevaluationtool
changeset 3102:972b55d81c1b
#171 Completed
author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
---|---|
date | Thu, 18 Jan 2018 10:12:12 +0000 |
parents | cd34732a2e39 |
children | d79b9939b19e |
files | css/core.css js/core.js |
diffstat | 2 files changed, 25 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/css/core.css Wed Jan 17 17:41:25 2018 +0000 +++ b/css/core.css Thu Jan 18 10:12:12 2018 +0000 @@ -240,7 +240,7 @@ height: auto; } div.calibration-slider { - width: 50px; + width: 44px; margin: 2px; text-align: center; align-content: center; @@ -253,7 +253,15 @@ /* WebKit */ width: 8px; padding: 0 5px; - height: 290px; + height: 200px; +} +button.calibration-button { + height: 25px; + border-radius: 5px; + border: #444; + border-width: 1px; + border-style: solid; + background-color: white; } /* Comment Boxes */
--- a/js/core.js Wed Jan 17 17:41:25 2018 +0000 +++ b/js/core.js Thu Jan 18 10:12:12 2018 +0000 @@ -3233,7 +3233,7 @@ } return storageRoot; } - var calibrationObject = undefined, + var calibrationObject, _checkedFrequency = false, _checkedChannels = false; @@ -3242,6 +3242,8 @@ function createFrequencyElement(frequency) { return (function (frequency) { + var hold = document.createElement("div"); + hold.className = "calibration-slider"; var range = document.createElement("input"); range.type = "range"; range.min = "-24"; @@ -3250,12 +3252,13 @@ range.setAttribute("orient", "vertical"); range.value = (Math.random() - 0.5) * 24; range.setAttribute("frequency", frequency); - htmlRoot.append(range); + hold.appendChild(range); + htmlRoot.appendChild(hold); var gain = audioContext.createGain(); gain.connect(outputGain); gain.gain.value = Math.pow(10, Number(range.value) / 20.0); - var osc = undefined; + var osc; var store = storage.document.createElement("response"); store.setAttribute("frequency", frequency); @@ -3295,7 +3298,7 @@ outputGain.gain.value = 0.25; outputGain.connect(audioContext.destination); this.sliders = frequencies.map(createFrequencyElement); - } + }; var checkChannelsUnit = function (htmlRoot, storageRoot) { @@ -3325,18 +3328,22 @@ play.onclick = function () { osc.start(); play.disabled = true; - } + }; + play.className = "calibration-button"; htmlRoot.appendChild(play); var choiceHolder = document.createElement("div"); var leftButton = document.createElement("button"); leftButton.textContent = "Left"; leftButton.value = "-1"; + leftButton.className = "calibration-button"; var centerButton = document.createElement("button"); centerButton.textContent = "Middle"; centerButton.value = "0"; + centerButton.className = "calibration-button"; var rightButton = document.createElement("button"); rightButton.textContent = "Right"; rightButton.value = "1"; + rightButton.className = "calibration-button"; choiceHolder.appendChild(leftButton); choiceHolder.appendChild(centerButton); choiceHolder.appendChild(rightButton); @@ -3362,13 +3369,13 @@ storageHook.setAttribute("presented", pan); storageHook.setAttribute("presentedText", "Left"); } - } + }; var interface = {}; Object.defineProperties(interface, { "calibrationObject": { "get": function () { - return calibrationObject + return calibrationObject; }, "set": readonly }, @@ -3404,7 +3411,7 @@ _checkedChannels = true; } } - }) + }); return interface; })();