X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FBlosum62ColourScheme.java;h=70f49109249aba5b43c54b9f8b7810dde2844973;hb=8a90391b6a6bd00adeb3289044fa34d88d74d978;hp=f35b886cac6a80aff32e8240df1febae4e51975c;hpb=eeb9907df14f1015db254a87bcc8db35e10ba02d;p=jalview.git diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java index f35b886..70f4910 100755 --- a/src/jalview/schemes/Blosum62ColourScheme.java +++ b/src/jalview/schemes/Blosum62ColourScheme.java @@ -20,6 +20,8 @@ */ package jalview.schemes; +import jalview.analysis.scoremodels.ScoreModels; +import jalview.api.analysis.PairwiseScoreModelI; import jalview.datamodel.AnnotatedCollectionI; import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceI; @@ -53,6 +55,8 @@ public class Blosum62ColourScheme extends ResidueColourScheme public Color findColour(char res, int j, SequenceI seq, String consensusResidue, float pid) { + PairwiseScoreModelI sm = ScoreModels.getInstance().getBlosum62(); + /* * compare as upper case; note consensusResidue is * always computed as uppercase @@ -75,14 +79,14 @@ public class Blosum62ColourScheme extends ResidueColourScheme } else { - int c = 0; + float score = 0; for (char consensus : consensusResidue.toCharArray()) { - c += ResidueProperties.getBLOSUM62(consensus, res); + score += sm.getPairwiseScore(consensus, res); } - if (c > 0) + if (score > 0) { colour = LIGHT_BLUE; }