diff --git a/CHANGELOG b/CHANGELOG index f7201020d0f10301683362c43c834e5982461dad..248ce299b87b2e87dfd31f36a3602f4f8458f4b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +minerva (10.0.4) stable; urgency=medium + + * Bug fix: overlays colors are centered in white (not black) + + -- Piotr Gawron <piotr.gawron@uni.lu> Fri, 16 Dec 2016 10:01:16 +0200 + minerva (10.0.3) stable; urgency=medium * Bug fix: login cannot contain whitespace diff --git a/persist/src/db/10.0.4/fix_db_20161215.sql b/persist/src/db/10.0.4/fix_db_20161215.sql new file mode 100644 index 0000000000000000000000000000000000000000..a33b6ad89d4881c84fb355b8c56d309760e66b70 --- /dev/null +++ b/persist/src/db/10.0.4/fix_db_20161215.sql @@ -0,0 +1 @@ +-- empty file to force directory to be commited to git repo diff --git a/web/src/main/webapp/resources/js/Functions.js b/web/src/main/webapp/resources/js/Functions.js index c7292f2d252a17528fd97ff9f84ab5efe5112ce8..6d03ee4ca4055d7424a44bf97ede6b88bdb01ca5 100644 --- a/web/src/main/webapp/resources/js/Functions.js +++ b/web/src/main/webapp/resources/js/Functions.js @@ -167,20 +167,26 @@ overlayToColor = function(elementOverlay) { ratio = elementOverlay.value; color = ServerConnector.getMaxOverlayColorInt(); } - var red = color & 0xFF0000; - red = red*ratio; + ratio = 1 - ratio + var MAX_RED = 0xFF0000; + var MAX_GREEN = 0x00FF00; + var MAX_BLUE = 0x0000FF; + + var red = color & MAX_RED; + + red = red+ (MAX_RED-red)* ratio; red = parseInt(red); red = red & 0xFF0000; - var green = color & 0x00FF00; - green = green*ratio; + var green = color & MAX_GREEN; + green = green + (MAX_GREEN-green)* ratio; green = parseInt(green); - green = green & 0x00FF00; + green = green & MAX_GREEN; - var blue = color & 0x0000FF; - blue = blue*ratio; + var blue = color & MAX_BLUE; + blue = blue + (MAX_BLUE-blue)* ratio; blue = parseInt(blue); - blue = blue & 0x0000FF; + blue = blue & MAX_BLUE; var color = red | green | blue; return intToColorString(color);