From c98e8e641751e3ce37b7689e0c25526c8f9e6091 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 21 Jun 2013 14:29:41 +0100 Subject: [PATCH] JAL-1241 - generate colour for all annotation values within range --- src/jalview/schemes/AnnotationColourGradient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java index 218b5fa..729065c 100755 --- a/src/jalview/schemes/AnnotationColourGradient.java +++ b/src/jalview/schemes/AnnotationColourGradient.java @@ -228,14 +228,14 @@ public class AnnotationColourGradient extends ResidueColourScheme if (thresholdIsMinMax && annotation.threshold != null && aboveAnnotationThreshold == ABOVE_THRESHOLD - && annotation.annotations[j].value > annotation.threshold.value) + && annotation.annotations[j].value >= annotation.threshold.value) { range = (annotation.annotations[j].value - annotation.threshold.value) / (annotation.graphMax - annotation.threshold.value); } else if (thresholdIsMinMax && annotation.threshold != null && aboveAnnotationThreshold == BELOW_THRESHOLD - && annotation.annotations[j].value > annotation.graphMin) + && annotation.annotations[j].value >= annotation.graphMin) { range = (annotation.annotations[j].value - annotation.graphMin) / (annotation.threshold.value - annotation.graphMin); @@ -250,7 +250,7 @@ public class AnnotationColourGradient extends ResidueColourScheme { currentColour = colourScheme.findColour(c, j, seq); } - else if (range != 0) + else { dr = rr * range + r1; dg = gg * range + g1; -- 1.7.10.2