X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FBlosum62ColourScheme.java;h=0a943bdfa9247782977b7be9cbb794917d988271;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=d91d49fe0410f19ec7349259d745c6229e404936;hpb=1ecf6419aba86993b3c223bf5ec0fa79427baf85;p=jalview.git

diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index d91d49f..0a943bd 100755
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -1,63 +1,88 @@
-/* Jalview - a java multiple alignment editor
- * Copyright (C) 1998  Michele Clamp
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package jalview.schemes;
-
-
-import java.util.*;
-import java.awt.*;
-import jalview.gui.*;
-import jalview.datamodel.*;
-
-public class Blosum62ColourScheme extends ResidueColourScheme
-{
-
-  // need to keep an eye on the changing visible consensus sequence
-  AlignViewport av;
-
-  public Blosum62ColourScheme(AlignViewport av)
-  {
-    super();
-    this.av = av;
-  }
-
-  public Color findColour(SequenceI seq, String s, int j, Vector aa)
-  {
-      if (!s.equals("-") && !s.equals(".") && !s.equals(" "))
-      {
-        String max = av.getVisibleConsensus().charAt(j) + "";
-
-        if (s.equals(max))
-          return new Color(154, 154, 255);
-        else if (ResidueProperties.getBLOSUM62(max, s) > 0)
-          return new Color(204, 204, 255);
-        else
-          return Color.white;
-
-      }
-      else
-        return Color.white;
-
-  }
-
-  public boolean canThreshold()
-  {
-    return false;
-  }
-
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 
+ * 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/>.
+ */
+package jalview.schemes;
+
+import java.awt.*;
+
+import jalview.analysis.*;
+
+public class Blosum62ColourScheme extends ResidueColourScheme
+{
+  public Blosum62ColourScheme()
+  {
+    super();
+  }
+
+  public Color findColour(char res, int j)
+  {
+    if ('a' <= res && res <= 'z')
+    {
+      // TO UPPERCASE !!!
+      res -= ('a' - 'A');
+    }
+
+    if (consensus == null || j >= consensus.length || consensus[j] == null
+            || (threshold != 0 && !aboveThreshold(res, j)))
+    {
+      return Color.white;
+    }
+
+    Color currentColour;
+
+    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();
+
+        do
+        {
+          c += ResidueProperties.getBLOSUM62(max.charAt(max_aa), res);
+        } while (++max_aa < n);
+
+        if (c > 0)
+        {
+          currentColour = new Color(204, 204, 255);
+        }
+        else
+        {
+          currentColour = Color.white;
+        }
+      }
+
+      if (conservationColouring)
+      {
+        currentColour = applyConservation(currentColour, j);
+      }
+    }
+    else
+    {
+      return Color.white;
+    }
+
+    return currentColour;
+  }
+}