X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fdevelopment%2FResidueRenderer.java;h=fe073896bea2c918a5e23f1714779a1dc3e42d7b;hb=f507bf348ffed906d04bc76a614d6778d4cb5d64;hp=1d022671d5f12b0b68f6619c8eb18ab8b7af0af0;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/development/ResidueRenderer.java b/forester/java/src/org/forester/development/ResidueRenderer.java index 1d02267..fe07389 100644 --- a/forester/java/src/org/forester/development/ResidueRenderer.java +++ b/forester/java/src/org/forester/development/ResidueRenderer.java @@ -21,7 +21,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // // Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester +// WWW: https://sites.google.com/site/cmzmasek/home/software/forester package org.forester.development; @@ -39,7 +39,7 @@ public class ResidueRenderer extends AbstractRenderer { static final int DISTANCE_OVAL_BORDER = 1; static final int SIZE_LIMIT = 7; /** - * + * */ private static final long serialVersionUID = -2331160296913478874L; private final char _value; @@ -72,9 +72,9 @@ public class ResidueRenderer extends AbstractRenderer { value = max; } final double x = ( 255D * ( value - min ) ) / ( max - min ); - final int red = ( int ) ( minColor.getRed() + x * calcFactor( minColor.getRed(), maxColor.getRed() ) ); - final int green = ( int ) ( minColor.getGreen() + x * calcFactor( minColor.getGreen(), maxColor.getGreen() ) ); - final int blue = ( int ) ( minColor.getBlue() + x * calcFactor( minColor.getBlue(), maxColor.getBlue() ) ); + final int red = ( int ) ( minColor.getRed() + ( x * calcFactor( minColor.getRed(), maxColor.getRed() ) ) ); + final int green = ( int ) ( minColor.getGreen() + ( x * calcFactor( minColor.getGreen(), maxColor.getGreen() ) ) ); + final int blue = ( int ) ( minColor.getBlue() + ( x * calcFactor( minColor.getBlue(), maxColor.getBlue() ) ) ); return new Color( red, green, blue ); } @@ -99,18 +99,18 @@ public class ResidueRenderer extends AbstractRenderer { } if ( value < mean ) { final double x = ( 255D * ( value - min ) ) / ( mean - min ); - final int red = ( int ) ( minColor.getRed() + x * calcFactor( minColor.getRed(), meanColor.getRed() ) ); - final int green = ( int ) ( minColor.getGreen() + x - * calcFactor( minColor.getGreen(), meanColor.getGreen() ) ); - final int blue = ( int ) ( minColor.getBlue() + x * calcFactor( minColor.getBlue(), meanColor.getBlue() ) ); + final int red = ( int ) ( minColor.getRed() + ( x * calcFactor( minColor.getRed(), meanColor.getRed() ) ) ); + final int green = ( int ) ( minColor.getGreen() + ( x * calcFactor( minColor.getGreen(), + meanColor.getGreen() ) ) ); + final int blue = ( int ) ( minColor.getBlue() + ( x * calcFactor( minColor.getBlue(), meanColor.getBlue() ) ) ); return new Color( red, green, blue ); } if ( value > mean ) { final double x = ( 255D * ( value - mean ) ) / ( max - mean ); - final int red = ( int ) ( meanColor.getRed() + x * calcFactor( meanColor.getRed(), maxColor.getRed() ) ); - final int green = ( int ) ( meanColor.getGreen() + x - * calcFactor( meanColor.getGreen(), maxColor.getGreen() ) ); - final int blue = ( int ) ( meanColor.getBlue() + x * calcFactor( meanColor.getBlue(), maxColor.getBlue() ) ); + final int red = ( int ) ( meanColor.getRed() + ( x * calcFactor( meanColor.getRed(), maxColor.getRed() ) ) ); + final int green = ( int ) ( meanColor.getGreen() + ( x * calcFactor( meanColor.getGreen(), + maxColor.getGreen() ) ) ); + final int blue = ( int ) ( meanColor.getBlue() + ( x * calcFactor( meanColor.getBlue(), maxColor.getBlue() ) ) ); return new Color( red, green, blue ); } else {