X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FPIDColourScheme.java;h=6ca1393f44656d77ba9277a7ad7283f3957731a3;hb=400b50efffaa43ae2c3b4d3f653bf8215c5d1edc;hp=69cd269ae1260fee8315612b093a2d377d7975e0;hpb=08732f131d6b09a1a9ad53381d333c3f159b3dd2;p=jalview.git

diff --git a/src/jalview/schemes/PIDColourScheme.java b/src/jalview/schemes/PIDColourScheme.java
index 69cd269..6ca1393 100755
--- a/src/jalview/schemes/PIDColourScheme.java
+++ b/src/jalview/schemes/PIDColourScheme.java
@@ -1,59 +1,109 @@
-package jalview.schemes;
-
-import jalview.datamodel.*;
-import java.util.*;
-import java.awt.*;
-
-public class PIDColourScheme extends ResidueColourScheme {
-    public Color[] pidColours;
-    public float[] thresholds;
-
-    SequenceGroup group;
-
-    public PIDColourScheme() {
-	this.pidColours = ResidueProperties.pidColours;
-	this.thresholds = ResidueProperties.pidThresholds;
-    }
-  public Color getColour(SequenceI seq, int j,Vector aa) {
-    Color c = Color.white;
-
-    String       s = seq.getSequence(j,j+1);
-
-    if (aa != null && j < aa.size()) {
-	c = findColour(seq,s,j,aa);
-    }
-
-    return c;
-  }
-
-  public Color findColour(SequenceI seq,String s, int j,Vector aa) {
-      Color     c    = Color.white;
-      Hashtable hash = null;
-
-      if (aa != null) {
-	  hash = (Hashtable)aa.elementAt(j);
-      }
-      else
-        return c;
-
-      String    max  = (String)hash.get("maxResidue");
-
-      double sc = 0;
-      if (((Integer)hash.get("maxCount")).intValue() != -1  && hash.contains(s)) {
-	  sc = ((Integer)hash.get(s)).intValue()*100.0/Integer.parseInt((String)hash.get("maxResidue"));
-
-	  // MC Should be isGap
-	  if  ( !s.equals("-")  && !s.equals(".") && !s.equals(" ")) {
-	      for (int i=0; i < thresholds.length; i++) {
-		  if (sc > thresholds[i]) {
-		      c = pidColours[i];
-		      break;
-		  }
-	      }
-	  } else {
-	      c = Color.white;
-	  }
-      }
-      return c;
-  }
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.schemes;
+
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.Comparison;
+
+import java.awt.Color;
+import java.util.Map;
+
+public class PIDColourScheme extends ResidueColourScheme
+{
+  public Color[] pidColours;
+
+  public float[] thresholds;
+
+  SequenceGroup group;
+
+  public PIDColourScheme()
+  {
+    this.pidColours = ResidueProperties.pidColours;
+    this.thresholds = ResidueProperties.pidThresholds;
+  }
+
+  @Override
+  public Color findColour(char c, int j, SequenceI seq,
+          String consensusResidue, float pid)
+  {
+    /*
+     * make everything uppercase; note this does nothing (fast)
+     * if consensusResidue is already uppercase
+     */
+    consensusResidue = consensusResidue.toUpperCase();
+    if ('a' <= c && c <= 'z')
+    {
+      c -= ('a' - 'A');
+    }
+
+    if (consensusResidue == null || Comparison.isGap(c))
+    {
+      return Color.white;
+    }
+
+    Color colour = Color.white;
+
+    /*
+     * test whether this is the consensus (or joint consensus) residue
+     */
+    boolean matchesConsensus = consensusResidue.contains(
+            String.valueOf(c));
+    if (matchesConsensus)
+    {
+      for (int i = 0; i < thresholds.length; i++)
+      {
+        if (pid > thresholds[i])
+        {
+          colour = pidColours[i];
+          break;
+        }
+      }
+    }
+
+    return colour;
+  }
+
+  @Override
+  public String getSchemeName()
+  {
+    return JalviewColourScheme.PID.toString();
+  }
+
+  /**
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
+   */
+  @Override
+  public ColourSchemeI getInstance(AnnotatedCollectionI coll,
+          Map<SequenceI, SequenceCollectionI> hrs)
+  {
+    return new PIDColourScheme();
+  }
+
+  @Override
+  public boolean isSimple()
+  {
+    return false;
+  }
+}