X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FPIDColourScheme.java;h=3a5c066397dbc2182061da7d6529ff9551b77e02;hp=a79f0833da6dc4ffcc7d25e1b9b315cf6a10bc56;hb=4d959452a9c486b6d94291d8e819036ec19b09ef;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab

diff --git a/src/jalview/schemes/PIDColourScheme.java b/src/jalview/schemes/PIDColourScheme.java
index a79f083..3a5c066 100755
--- a/src/jalview/schemes/PIDColourScheme.java
+++ b/src/jalview/schemes/PIDColourScheme.java
@@ -1,83 +1,105 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-package jalview.schemes;
-
-import java.awt.*;
-
-import jalview.datamodel.*;
-
-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 findColour(String s, int j)
-  {
-    char res = s.charAt(0);
-    if ('a' <= res && res <= 'z')
-    {
-      s = String.valueOf(res -= ('a' - 'A'));
-    }
-
-
-    if ( (threshold != 0) && !aboveThreshold(s, j))
-    {
-      return Color.white;
-    }
-
-    currentColour = Color.white;
-
-    double sc = 0;
-
-    if(consensus.length<=j)
-      return Color.white;
-
-      if ( (Integer.parseInt(consensus[j].get("maxCount").toString()) != -1) &&
-          consensus[j].contains(s))
-      {
-        sc = ( (Float) consensus[j].get(ignoreGaps)).floatValue();
-
-        if (!jalview.util.Comparison.isGap(res))
-        {
-          for (int i = 0; i < thresholds.length; i++)
-          {
-            if (sc > thresholds[i])
-            {
-              currentColour = pidColours[i];
-
-              break;
-            }
-          }
-        }
-      }
-
-    if(conservationColouring)
-         applyConservation(j);
-
-    return currentColour;
-  }
-}
+/*
+ * 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.api.AlignViewportI;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.Comparison;
+
+import java.awt.Color;
+
+public class PIDColourScheme extends ResidueColourScheme
+{
+  private static final Color[] pidColours = { new Color(100, 100, 255),
+      new Color(153, 153, 255), new Color(204, 204, 255), };
+
+  private static final float[] thresholds = { 80, 60, 40, };
+
+  SequenceGroup group;
+
+  public PIDColourScheme()
+  {
+  }
+
+  @Override
+  public Color findColour(char c, int j, SequenceI seq,
+          String consensusResidue, float pid)
+  {
+    /*
+     * compare as upper case; note consensusResidue is 
+     * always computed as uppercase
+     */
+    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(AlignViewportI view,
+          AnnotatedCollectionI coll)
+  {
+    return new PIDColourScheme();
+  }
+
+  @Override
+  public boolean isSimple()
+  {
+    return false;
+  }
+}