X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FBlosum62ColourScheme.java;h=0db55c03c8b0946692a5709acc6fa28744358476;hb=a96d51f58325f8429c5792ae554243de5628d62a;hp=2e18c6a419920a09a91cd3056bbf658f2e7d64c5;hpb=ac4bbf6dd2bfccdaae9067fb4765c73600dea729;p=jalview.git

diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index 2e18c6a..0db55c0 100755
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -1,5 +1,6 @@
-/* Jalview - a java multiple alignment editor
- * Copyright (C) 1998  Michele Clamp
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 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
@@ -13,58 +14,81 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-
 package jalview.schemes;
 
-
-import java.util.*;
 import java.awt.*;
-import jalview.gui.*;
-import jalview.datamodel.*;
 
-public class Blosum62ColourScheme extends ResidueColourScheme
-{
+import jalview.analysis.*;
 
+public class Blosum62ColourScheme
+    extends ResidueColourScheme
+{
   public Blosum62ColourScheme()
   {
     super();
   }
 
-  public Color findColour(String s, int j)
+  public Color findColour(char res, int j)
   {
-    Hashtable hash = (Hashtable)consensus.elementAt(j);
+    if ('a' <= res && res <= 'z')
+    {
+      // TO UPPERCASE !!!
+      res -= ('a' - 'A');
+    }
 
-    if (!jalview.util.Comparison.isGap((s.charAt(0))))
+    if (consensus == null ||
+        j >= consensus.length ||
+        consensus[j] == null ||
+        (threshold != 0 && !aboveThreshold(res, j)))
     {
-      String    max  = (String)hash.get("maxResidue");
+      return Color.white;
+    }
 
-      if (max.indexOf(s)>-1)
-        return new Color(154, 154, 255);
-      else {
+    Color currentColour;
 
-        int c = 0,
-            max_aa=0,
-            n=max.length();
-        do {
-          c+=ResidueProperties.getBLOSUM62(max.substring(max_aa, max_aa+1), s);
-        } while (++max_aa<n);
+    if (!jalview.util.Comparison.isGap(res))
+    {
+      String max = (String) consensus[j].get(AAFrequency.MAXRESIDUE);
+
+      if (max.indexOf(res) > -1)
+      {
+        currentColour = new Color(154, 154, 255);
+      }
+      else
+      {
+        int c = 0;
+        int max_aa = 0;
+        int n = max.length();
 
-        if (c>0)
-          return new Color(204, 204, 255);
+        do
+        {
+          c += ResidueProperties.getBLOSUM62(
+              max.charAt(max_aa), res);
+        }
+        while (++max_aa < n);
+
+        if (c > 0)
+        {
+          currentColour = new Color(204, 204, 255);
+        }
         else
-          return Color.white;
+        {
+          currentColour = Color.white;
+        }
+      }
+
+      if (conservationColouring)
+      {
+        currentColour = applyConservation(currentColour, j);
       }
     }
     else
-        return Color.white;
-
-  }
+    {
+      return Color.white;
+    }
 
-  public boolean canThreshold()
-  {
-    return true;
+    return currentColour;
   }
-
 }