JAL-3215 refactored ScoreColourScheme construction for scriptability

[jalview.git] / src / jalview / schemes / TurnColourScheme.java

diff --git a/src/jalview/schemes/TurnColourScheme.java b/src/jalview/schemes/TurnColourScheme.java
index 67116b8..4f354a5 100755 (executable)
--- a/src/jalview/schemes/TurnColourScheme.java
+++ b/src/jalview/schemes/TurnColourScheme.java
@@ -20,42 +20,27 @@
  */
 package jalview.schemes;
 
+import jalview.api.AlignViewportI;
 import jalview.datamodel.AnnotatedCollectionI;
-import jalview.datamodel.SequenceCollectionI;
-import jalview.datamodel.SequenceI;
 
 import java.awt.Color;
-import java.util.Map;
 
 /**
- * DOCUMENT ME!
- * 
- * @author $author$
- * @version $Revision$
+ * A graduated colour scheme based on residue turn propensity
  */
 public class TurnColourScheme extends ScoreColourScheme
 {
-  /**
-   * Creates a new TurnColourScheme object.
-   */
-  public TurnColourScheme()
-  {
-    super(ResidueProperties.aaIndex, ResidueProperties.turn,
-            ResidueProperties.turnmin, ResidueProperties.turnmax);
-  }
+  private static final Color minScoreColour = new Color(0, 255, 255);
+
+  private static final Color maxScoreColour = new Color(255, 0, 0);
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param c
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
+   * Constructor
    */
-  @Override
-  public Color makeColour(float c)
+  public TurnColourScheme()
   {
-    return new Color(c, 1 - c, 1 - c);
+    super(JalviewColourScheme.Turn.toString(), ResidueProperties.aaIndex,
+            ResidueProperties.turn, minScoreColour, maxScoreColour);
   }
 
   @Override
@@ -64,19 +49,13 @@ public class TurnColourScheme extends ScoreColourScheme
     return true;
   }
 
-  @Override
-  public String getSchemeName()
-  {
-    return JalviewColourScheme.Turn.toString();
-  }
-
   /**
    * Returns a new instance of this colour scheme with which the given data may
    * be coloured
    */
   @Override
-  public ColourSchemeI getInstance(AnnotatedCollectionI coll,
-          Map<SequenceI, SequenceCollectionI> hrs)
+  public ColourSchemeI getInstance(AlignViewportI view,
+          AnnotatedCollectionI coll)
   {
     return new TurnColourScheme();
   }