JAL-98 refactor bleachColour() to ColorUtils

[jalview.git] / src / jalview / schemes / ResidueColourScheme.java

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 56c573c..a15ca20 100755 (executable)
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -25,6 +25,7 @@ import jalview.analysis.Profile;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
+import jalview.util.ColorUtils;
 import jalview.util.Comparison;
 import jalview.util.MessageManager;
 
@@ -311,33 +312,13 @@ public class ResidueColourScheme implements ColourSchemeI
     float bleachFactor = (11 - (conservationScore - '0')) / 10f;
 
     /*
-     * scale this by the percentage slider / 20
-     */
-    bleachFactor *= (inc / 20f);
-
-    int red = currentColour.getRed();
-    int green = currentColour.getGreen();
-    int blue = currentColour.getBlue();
-
-    /*
-     * bleach colours towards white (255, 255, 255),
-     * depending on the consensus score and the conservation slider value
-     * scores of:                      0  1  2  3  4  5  6  7  8  9
+     * scale this up by 0-5 (percentage slider / 20)
+     * as a result, scores of:         0  1  2  3  4  5  6  7  8  9
      * fade to white at slider value: 18 20 22 25 29 33 40 50 67 100%
      */
-    red += (255 - red) * bleachFactor;
-    green += (255 - green) * bleachFactor;
-    blue += (255 - blue) * bleachFactor;
+    bleachFactor *= (inc / 20f);
 
-    if (red > 255 || green > 255 || blue > 255)
-    {
-      currentColour = Color.white;
-    }
-    else
-    {
-      currentColour = new Color(red, green, blue);
-    }
-    return currentColour;
+    return ColorUtils.bleachColour(currentColour, bleachFactor);
   }
 
   @Override