X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FScoreColourScheme.java;fp=src%2Fjalview%2Fschemes%2FScoreColourScheme.java;h=6850d79f7c78f765417e87e7a9af99f0895d5bb3;hb=8e1be43e250107a4d86898bd554cf03098fa5957;hp=ec06e0693c1e9bff6868d2bdcb47358a42cd9eb5;hpb=8b55eedb9d76a8c65b80f756c4412bf029906bf7;p=jalview.git diff --git a/src/jalview/schemes/ScoreColourScheme.java b/src/jalview/schemes/ScoreColourScheme.java index ec06e06..6850d79 100755 --- a/src/jalview/schemes/ScoreColourScheme.java +++ b/src/jalview/schemes/ScoreColourScheme.java @@ -23,6 +23,7 @@ package jalview.schemes; import jalview.datamodel.AnnotatedCollectionI; import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceI; +import jalview.util.Comparison; import java.awt.Color; import java.util.Map; @@ -97,27 +98,12 @@ public class ScoreColourScheme extends ResidueColourScheme @Override public Color findColour(char c, int j, SequenceI seq) { - if (threshold > 0) - { - if (!aboveThreshold(c, j)) - { - return Color.white; - } - } - - if (jalview.util.Comparison.isGap(c)) + if (Comparison.isGap(c)) { return Color.white; } - Color currentColour = colors[ResidueProperties.aaIndex[c]]; - - if (conservationColouring) - { - currentColour = applyConservation(currentColour, j); - } - - return currentColour; + return colors[ResidueProperties.aaIndex[c]]; } /**