X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FBlosum62ColourScheme.java;h=02f9b3e3d9f55bf5159699a8da8eb145931a3ce6;hb=refs%2Fheads%2Fkjvdh%2Ffeatures%2Ftesting;hp=a88f74f6b92bf38671ead63a6635434b4542a848;hpb=a45b4529c64901e9e4b53b6c74ee804370c91002;p=jalview.git diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java index a88f74f..02f9b3e 100755 --- a/src/jalview/schemes/Blosum62ColourScheme.java +++ b/src/jalview/schemes/Blosum62ColourScheme.java @@ -20,8 +20,8 @@ */ package jalview.schemes; -import jalview.analysis.scoremodels.PairwiseSeqScoreModel; import jalview.analysis.scoremodels.ScoreModels; +import jalview.api.analysis.PairwiseScoreModelI; import jalview.datamodel.AnnotatedCollectionI; import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceI; @@ -33,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() @@ -55,8 +56,7 @@ public class Blosum62ColourScheme extends ResidueColourScheme public Color findColour(char res, int j, SequenceI seq, String consensusResidue, float pid) { - PairwiseSeqScoreModel sm = (PairwiseSeqScoreModel) ScoreModels - .getInstance().forName(ScoreModels.BLOSUM62); + PairwiseScoreModelI sm = ScoreModels.getInstance().getBlosum62(); /* * compare as upper case; note consensusResidue is @@ -85,7 +85,6 @@ public class Blosum62ColourScheme extends ResidueColourScheme for (char consensus : consensusResidue.toCharArray()) { score += sm.getPairwiseScore(consensus, res); - // score += ResidueProperties.getBLOSUM62(consensus, res); } if (score > 0)