JAL-2416 scoreMatrices removed from ResidueProperties

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

diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index c03c40b..a88f74f 100755 (executable)
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -20,6 +20,8 @@
  */
 package jalview.schemes;
 
+import jalview.analysis.scoremodels.PairwiseSeqScoreModel;
+import jalview.analysis.scoremodels.ScoreModels;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
@@ -53,6 +55,9 @@ 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);
+
     /*
      * compare as upper case; note consensusResidue is 
      * always computed as uppercase
@@ -79,7 +84,8 @@ public class Blosum62ColourScheme extends ResidueColourScheme
 
       for (char consensus : consensusResidue.toCharArray())
       {
-        score += ResidueProperties.getBLOSUM62(consensus, res);
+        score += sm.getPairwiseScore(consensus, res);
+        // score += ResidueProperties.getBLOSUM62(consensus, res);
       }
 
       if (score > 0)