X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FPIDColourScheme.java;fp=src%2Fjalview%2Fschemes%2FPIDColourScheme.java;h=0ad5b5caaeedd4e7f3caaca96ac49dd02e3aaaed;hb=fbc92d8f171f75002890bfa0ea1f436f7125d3b5;hp=ccc69c286b29259be84f278ddac2fd1bbab00b61;hpb=2466e94aa67b0559bd5c4c6e17d60b6fac3cb756;p=jalview.git diff --git a/src/jalview/schemes/PIDColourScheme.java b/src/jalview/schemes/PIDColourScheme.java index ccc69c2..0ad5b5c 100755 --- a/src/jalview/schemes/PIDColourScheme.java +++ b/src/jalview/schemes/PIDColourScheme.java @@ -20,6 +20,7 @@ */ package jalview.schemes; +import jalview.datamodel.ProfileI; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.util.Comparison; @@ -48,7 +49,7 @@ public class PIDColourScheme extends ResidueColourScheme c -= ('a' - 'A'); } - if (consensus == null || j >= consensus.length || consensus[j] == null) + if (consensus == null || consensus.get(j) == null) { return Color.white; } @@ -62,19 +63,16 @@ public class PIDColourScheme extends ResidueColourScheme double sc = 0; - if (consensus.length <= j) - { - return Color.white; - } /* * test whether this is the consensus (or joint consensus) residue */ - boolean matchesConsensus = consensus[j].getModalResidue().contains( + ProfileI profile = consensus.get(j); + boolean matchesConsensus = profile.getModalResidue().contains( String.valueOf(c)); if (matchesConsensus) { - sc = consensus[j].getPercentageIdentity(ignoreGaps); + sc = profile.getPercentageIdentity(ignoreGaps); if (!Comparison.isGap(c)) {