X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fschemes%2FResidueColourScheme.java;h=31b832051e51a94e63dc37061781e5aa4c9144e3;hb=8bb1df31c9d46763d2a3278d27d52ce69ba441b3;hp=bf8366547f6d93fb38e857de28994fd5c3b3b758;hpb=3d941a02a998676a12f8ff43fa98d9e1f4c27142;p=jalview.git
diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index bf83665..31b8320 100755
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -1,267 +1,344 @@
-/*
-* 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 jalview.analysis.*;
-
-import java.awt.*;
-
-import java.util.*;
-
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
- */
-public class ResidueColourScheme implements ColourSchemeI
-{
-
- boolean conservationColouring = false;
- boolean consensusColouring = false;
-
- Color[] colors;
- int threshold = 0;
-
- /* Set when threshold colouring to either pid_gaps or pid_nogaps*/
- protected String ignoreGaps = AAFrequency.PID_GAPS;
-
- /** Consenus as a hashtable array */
- Hashtable [] consensus;
-
- /** Conservation string as a char array */
- char [] conservation;
-
- /** DOCUMENT ME!! */
- int inc = 30;
-
-
- /**
- * Creates a new ResidueColourScheme object.
- *
- * @param colors DOCUMENT ME!
- * @param threshold DOCUMENT ME!
- */
- public ResidueColourScheme(Color[] colours, int threshold)
- {
- this.colors = colours;
- this.threshold = threshold;
- }
-
- /**
- * Creates a new ResidueColourScheme object.
- */
- public ResidueColourScheme()
- {
- }
-
- /**
- * Find a colour without an index in a sequence
- */
- public Color findColour(String aa)
- {
- return colors[ResidueProperties.aaIndex[aa.charAt(0)]];
- }
-
-
-
- public Color findColour(String s, int j)
- {
- Color currentColour;
- int index = ResidueProperties.aaIndex[s.charAt(0)];
-
- if ((threshold == 0) || aboveThreshold(ResidueProperties.aa[index], j))
- {
- currentColour = colors[index];
- }
- else
- {
- currentColour = Color.white;
- }
-
- if(conservationColouring)
- applyConservation(currentColour, j);
-
-
- return currentColour;
- }
-
-
- /**
- * Get the percentage threshold for this colour scheme
- *
- * @return Returns the percentage threshold
- */
- public int getThreshold()
- {
- return threshold;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param ct DOCUMENT ME!
- */
- public void setThreshold(int ct, boolean ignoreGaps)
- {
- threshold = ct;
- if(ignoreGaps)
- this.ignoreGaps = AAFrequency.PID_NOGAPS;
- else
- this.ignoreGaps = AAFrequency.PID_GAPS;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param s DOCUMENT ME!
- * @param j DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean aboveThreshold(String s, int j)
- {
- char c = s.charAt(0);
- if ('a' <= c && c <= 'z')
- {
- // TO UPPERCASE !!!
- //Faster than toUpperCase
- c -= ('a' - 'A');
- s = String.valueOf(c);
- }
-
- if (consensus == null || consensus[j] == null)
- return false;
-
- if ( ( ( (Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) &&
- consensus[j].contains(s))
- {
- if ( ( (Float) consensus[j].get(ignoreGaps)).floatValue() >= threshold)
- {
- return true;
- }
- }
-
- return false;
- }
-
-
- public boolean conservationApplied()
- {
- return conservationColouring;
- }
-
- public void setConservationInc(int i)
- {
- inc = i;
- }
-
- public int getConservationInc()
- {
- return inc;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param consensus DOCUMENT ME!
- */
- public void setConsensus(Hashtable [] consensus)
- {
- if(consensus==null)
- return;
-
- this.consensus = consensus;
- }
-
-
-
- public void setConservation(Conservation cons)
- {
- if(cons==null)
- {
- conservationColouring = false;
- conservation = null;
- }
- else
- {
- conservationColouring = true;
- int i, iSize = cons.getConsSequence().getLength();
- conservation = new char[iSize];
- for (i = 0; i < iSize; i++)
- conservation[i] = cons.getConsSequence().getCharAt(i);
- }
-
- }
-
-
- /**
- * DOCUMENT ME!
- *
- * @param s DOCUMENT ME!
- * @param i DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
-
- void applyConservation(Color currentColour, int i)
- {
-
- if ((conservation[i] != '*') && (conservation[i] != '+'))
- {
- if(jalview.util.Comparison.isGap(conservation[i]))
- {
- currentColour = Color.white;
- }
- else
- {
- float t = 11 - (conservation[i] - '0');
- if(t==0)
- {
- currentColour = Color.white;
- return;
- }
-
- int red = currentColour.getRed();
- int green = currentColour.getGreen();
- int blue = currentColour.getBlue();
-
- int dr = 255 - red;
- int dg = 255 - green;
- int db = 255 - blue;
-
- dr *= t / 10f;
- dg *= t / 10f;
- db *= t / 10f;
-
- red += (inc / 20f) * dr;
- green += (inc / 20f) * dg;
- blue += (inc / 20f) * db;
-
- if (red > 255 || green > 255 || blue > 255)
- currentColour = Color.white;
- else
- currentColour = new Color(red, green, blue);
- }
- }
- }
-
-
-}
+/*
+ * 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
+ * If a column is fully conserved (identical residues, conservation score 11, + * shown as *), or all 10 physico-chemical properties are conserved + * (conservation score 10, shown as +), then the colour is left unchanged. + *
+ * Otherwise a 'bleaching' factor is computed and applied to the colour. This
+ * is designed to fade colours for scores of 0-9 completely to white at slider
+ * positions ranging from 18% - 100% respectively.
+ *
+ * @param currentColour
+ * @param column
+ *
+ * @return bleached (or unmodified) colour
+ */
+ Color applyConservation(Color currentColour, int column)
+ {
+ if (conservation == null || conservation.length <= column)
+ {
+ return currentColour;
+ }
+ char conservationScore = conservation[column];
+
+ /*
+ * if residues are fully conserved (* or 11), or all properties
+ * are conserved (+ or 10), leave colour unchanged
+ */
+ if (conservationScore == '*' || conservationScore == '+'
+ || conservationScore == (char) 10
+ || conservationScore == (char) 11)
+ {
+ return currentColour;
+ }
+
+ if (Comparison.isGap(conservationScore))
+ {
+ return Color.white;
+ }
+
+ /*
+ * convert score 0-9 to a bleaching factor 1.1 - 0.2
+ */
+ float bleachFactor = (11 - (conservationScore - '0')) / 10f;
+
+ /*
+ * scale this up by 0-5 (percentage slider / 20)
+ * as a result, scores of: 0 1 2 3 4 5 6 7 8 9
+ * fade to white at slider value: 18 20 22 25 29 33 40 50 67 100%
+ */
+ bleachFactor *= (inc / 20f);
+
+ return ColorUtils.bleachColour(currentColour, bleachFactor);
+ }
+
+ @Override
+ public void alignmentChanged(AnnotatedCollectionI alignment,
+ Map