X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=site%2Fj2s%2Fjalview%2Futil%2FColorUtils.js;h=ed016dae283267a28e002ee6043494ce5362051f;hp=129c26504fb7c9f7d69e33ab37acd22b206b574c;hb=b9b7a352eee79b7764c3b09c9d19663075061d8c;hpb=7301a2415adab88038b291fc54caeeb3a5a47a44 diff --git a/site/j2s/jalview/util/ColorUtils.js b/site/j2s/jalview/util/ColorUtils.js index 129c265..ed016da 100644 --- a/site/j2s/jalview/util/ColorUtils.js +++ b/site/j2s/jalview/util/ColorUtils.js @@ -1,30 +1,30 @@ -Clazz.declarePackage ("jalview.util"); -Clazz.load (null, "jalview.util.ColorUtils", ["java.awt.Color", "java.util.Random"], function () { -c$ = Clazz.declareType (jalview.util, "ColorUtils"); -c$.generateRandomColor = Clazz.defineMethod (c$, "generateRandomColor", -function (mix) { -var random = new java.util.Random (); -var red = random.nextInt (256); -var green = random.nextInt (256); -var blue = random.nextInt (256); -if (mix != null) { -red = Clazz.doubleToInt ((red + mix.getRed ()) / 2); -green = Clazz.doubleToInt ((green + mix.getGreen ()) / 2); -blue = Clazz.doubleToInt ((blue + mix.getBlue ()) / 2); -}var color = new java.awt.Color (red, green, blue); -return color; -}, "java.awt.Color"); -c$.toTkCode = Clazz.defineMethod (c$, "toTkCode", -function (colour) { -var colstring = "#" + ((colour.getRed () < 16) ? "0" : "") + Integer.toHexString (colour.getRed ()) + ((colour.getGreen () < 16) ? "0" : "") + Integer.toHexString (colour.getGreen ()) + ((colour.getBlue () < 16) ? "0" : "") + Integer.toHexString (colour.getBlue ()); -return colstring; -}, "java.awt.Color"); -c$.darkerThan = Clazz.defineMethod (c$, "darkerThan", -function (col) { -return col == null ? null : col.darker ().darker ().darker (); -}, "java.awt.Color"); -c$.brighterThan = Clazz.defineMethod (c$, "brighterThan", -function (col) { -return col == null ? null : col.brighter ().brighter ().brighter (); -}, "java.awt.Color"); -}); +Clazz.declarePackage ("jalview.util"); +Clazz.load (null, "jalview.util.ColorUtils", ["java.awt.Color", "java.util.Random"], function () { +c$ = Clazz.declareType (jalview.util, "ColorUtils"); +c$.generateRandomColor = Clazz.defineMethod (c$, "generateRandomColor", +function (mix) { +var random = new java.util.Random (); +var red = random.nextInt (256); +var green = random.nextInt (256); +var blue = random.nextInt (256); +if (mix != null) { +red = Clazz.doubleToInt ((red + mix.getRed ()) / 2); +green = Clazz.doubleToInt ((green + mix.getGreen ()) / 2); +blue = Clazz.doubleToInt ((blue + mix.getBlue ()) / 2); +}var color = new java.awt.Color (red, green, blue); +return color; +}, "java.awt.Color"); +c$.toTkCode = Clazz.defineMethod (c$, "toTkCode", +function (colour) { +var colstring = "#" + ((colour.getRed () < 16) ? "0" : "") + Integer.toHexString (colour.getRed ()) + ((colour.getGreen () < 16) ? "0" : "") + Integer.toHexString (colour.getGreen ()) + ((colour.getBlue () < 16) ? "0" : "") + Integer.toHexString (colour.getBlue ()); +return colstring; +}, "java.awt.Color"); +c$.darkerThan = Clazz.defineMethod (c$, "darkerThan", +function (col) { +return col == null ? null : col.darker ().darker ().darker (); +}, "java.awt.Color"); +c$.brighterThan = Clazz.defineMethod (c$, "brighterThan", +function (col) { +return col == null ? null : col.brighter ().brighter ().brighter (); +}, "java.awt.Color"); +});