JAL-3215 refactored ScoreColourScheme construction for scriptability

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

diff --git a/src/jalview/schemes/HelixColourScheme.java b/src/jalview/schemes/HelixColourScheme.java
index 10a7ce5..ee7fbe4 100755 (executable)
--- a/src/jalview/schemes/HelixColourScheme.java
+++ b/src/jalview/schemes/HelixColourScheme.java
@@ -25,17 +25,19 @@ import jalview.datamodel.AnnotatedCollectionI;
 
 import java.awt.Color;
 
+/**
+ * A graduated colour scheme based on residue helix propensity score
+ */
 public class HelixColourScheme extends ScoreColourScheme
 {
-  public HelixColourScheme()
-  {
-    super(ResidueProperties.aaIndex, ResidueProperties.helix);
-  }
+  private static final Color minScoreColour = new Color(0, 255, 0);
 
-  @Override
-  public Color makeColour(float c)
+  private static final Color maxScoreColour = new Color(255, 0, 255);
+
+  public HelixColourScheme()
   {
-    return new Color(c, (float) 1.0 - c, c);
+    super(JalviewColourScheme.Helix.toString(), ResidueProperties.aaIndex,
+            ResidueProperties.helix, minScoreColour, maxScoreColour);
   }
 
   @Override
@@ -44,12 +46,6 @@ public class HelixColourScheme extends ScoreColourScheme
     return true;
   }
 
-  @Override
-  public String getSchemeName()
-  {
-    return JalviewColourScheme.Helix.toString();
-  }
-
   /**
    * Returns a new instance of this colour scheme with which the given data may
    * be coloured