JAL-1593 refactor rna helix colours to static singleton for consistent shading

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

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 385e080..57a2dd9 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -88,7 +88,7 @@ public class ColourSchemeProperty
   public static final int COVARIATION = 14;
 
   public static final int TCOFFEE = 15;
-  
+
   public static final int RNAHELIX = 16;
 
   public static final int RNAINTERACTION = 17;
@@ -352,11 +352,11 @@ public class ColourSchemeProperty
       ret = "T-Coffee Scores";
 
       break;
-      
+
     case RNAINTERACTION:
-        ret = "RNA Interaction type";
+      ret = "RNA Interaction type";
 
-        break;
+      break;
     case RNAHELIX:
       ret = "RNA Helices";
 
@@ -513,13 +513,13 @@ public class ColourSchemeProperty
     case TCOFFEE:
       cs = new TCoffeeColourScheme(coll);
       break;
-    
+
     case RNAHELIX:
       cs = new RNAHelicesColour(coll);
       break;
-      
-      // case COVARIATION:
-      // cs = new CovariationColourScheme(annotation);
+
+    // case COVARIATION:
+    // cs = new CovariationColourScheme(annotation);
     // break;
 
     case USER_DEFINED:
@@ -597,4 +597,33 @@ public class ColourSchemeProperty
 
     return col;
   }
+
+  public static Color rnaHelices[] = null;
+
+  public static void initRnaHelicesShading(int n)
+  {
+    int j = 0;
+    if (rnaHelices == null)
+    {
+      rnaHelices = new Color[n + 1];
+    }
+    else if (rnaHelices != null && rnaHelices.length <= n)
+    {
+      Color[] t = new Color[n + 1];
+      System.arraycopy(rnaHelices, 0, t, 0, rnaHelices.length);
+      j = rnaHelices.length;
+      rnaHelices = t;
+    }
+    else
+    {
+      return;
+    }
+    // Generate random colors and store
+    for (; j <= n; j++)
+    {
+      rnaHelices[j] = jalview.util.ColorUtils
+              .generateRandomColor(Color.white);
+    }
+  }
+
 }