Mercurial > hg > webaudioevaluationtool
diff interfaces/ape.js @ 2704:3a0be105ee85
#180. Fixed checkScaleRange
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Mon, 13 Mar 2017 13:29:28 +0000 |
parents | 536cb44c7292 |
children | c74c698795a9 |
line wrap: on
line diff
--- a/interfaces/ape.js Mon Mar 13 11:53:36 2017 +0000 +++ b/interfaces/ape.js Mon Mar 13 13:29:28 2017 +0000 @@ -101,17 +101,17 @@ max: scaleRange.max }; })(); - var outsideBounds = sliderHolder.sliders.some(function (elem) { - var a = convSliderPosToRate(elem); - if (a <= scales.min) { - return true; + var range = sliderHolder.sliders.reduce(function (a, b) { + var v = convSliderPosToRate(b) * 100.0; + return { + min: Math.min(a.min, v), + max: Math.max(a.max, v) } - if (a >= scales.max) { - return true; - } - return false; + }, { + min: 100, + max: 0 }); - if (!outsideBounds) { + if (range.min >= scales.min || range.max <= scales.max) { state = false; str += 'On axis "' + sliderHolder.interfaceObject.title + '" you have not used the full width of the scale. '; }