X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FBlosum62ColourScheme.java;h=02f9b3e3d9f55bf5159699a8da8eb145931a3ce6;hb=0efc6021e63ff62bb2e275501586c1900561b303;hp=c03c40b97db499641d95c3bc9d7f2d72fa6895e9;hpb=c6e8e8ccd10f21698226ae37196cd9680e6804a0;p=jalview.git diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java index c03c40b..02f9b3e 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; @@ -31,6 +33,7 @@ import java.util.Map; public class Blosum62ColourScheme extends ResidueColourScheme { private static final Color LIGHT_BLUE = new Color(204, 204, 255); + private static final Color DARK_BLUE = new Color(154, 154, 255); public Blosum62ColourScheme() @@ -53,6 +56,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 @@ -79,7 +84,7 @@ public class Blosum62ColourScheme extends ResidueColourScheme for (char consensus : consensusResidue.toCharArray()) { - score += ResidueProperties.getBLOSUM62(consensus, res); + score += sm.getPairwiseScore(consensus, res); } if (score > 0)