X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FScoreColourScheme.java;h=aa20121dc616bf9489ff9d5937ad8ca7050f62d7;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=7eb920d022847579e360e033cfdcab1523cbbdd8;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git

diff --git a/src/jalview/schemes/ScoreColourScheme.java b/src/jalview/schemes/ScoreColourScheme.java
index 7eb920d..aa20121 100755
--- a/src/jalview/schemes/ScoreColourScheme.java
+++ b/src/jalview/schemes/ScoreColourScheme.java
@@ -20,9 +20,12 @@
  */
 package jalview.schemes;
 
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
 
 import java.awt.Color;
+import java.util.Map;
 
 /**
  * DOCUMENT ME!
@@ -84,49 +87,30 @@ public class ScoreColourScheme extends ResidueColourScheme
   /**
    * DOCUMENT ME!
    * 
-   * @param s
-   *          DOCUMENT ME!
-   * @param j
+   * @param c
    *          DOCUMENT ME!
    * 
    * @return DOCUMENT ME!
    */
-  @Override
-  public Color findColour(char c, int j, SequenceI seq)
+  public Color makeColour(float c)
   {
-    if (threshold > 0)
-    {
-      if (!aboveThreshold(c, j))
-      {
-        return Color.white;
-      }
-    }
-
-    if (jalview.util.Comparison.isGap(c))
-    {
-      return Color.white;
-    }
-
-    Color currentColour = colors[ResidueProperties.aaIndex[c]];
-
-    if (conservationColouring)
-    {
-      currentColour = applyConservation(currentColour, j);
-    }
+    return new Color(c, (float) 0.0, (float) 1.0 - c);
+  }
 
-    return currentColour;
+  @Override
+  public String getSchemeName()
+  {
+    return "Score";
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param c
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
    */
-  public Color makeColour(float c)
+  @Override
+  public ColourSchemeI getInstance(AnnotatedCollectionI coll,
+          Map<SequenceI, SequenceCollectionI> hrs)
   {
-    return new Color(c, (float) 0.0, (float) 1.0 - c);
+    return new ScoreColourScheme(symbolIndex, scores, min, max);
   }
 }