X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FColourSchemeProperty.java;h=5715adacb34b744ecab7ace30b0a18c591a657b1;hb=2b0142bf85bf5b3d20612c01433e7ce29b633ec4;hp=d608a80d5ca537fd17cd3922e393e612ecd741ab;hpb=8d2724b83aca38ef75d68787cc5939d950467e63;p=jalview.git
diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index d608a80..5715ada 100755
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * 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.
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.schemes;
@@ -87,14 +89,16 @@ public class ColourSchemeProperty
public static final int TCOFFEE = 15;
- public static final int RNAINTERACTION = 16;
+ public static final int RNAHELIX = 16;
+
+ public static final int RNAINTERACTION = 17;
/**
* index of first colourscheme (includes 'None')
*/
public static final int FIRST_COLOUR = NONE;
- public static final int LAST_COLOUR = NUCLEOTIDE;
+ public static final int LAST_COLOUR = RNAINTERACTION;
/**
* DOCUMENT ME!
@@ -169,11 +173,14 @@ public class ColourSchemeProperty
{
ret = PURINEPYRIMIDINE;
}
-
else if (name.equalsIgnoreCase("RNA Interaction type"))
{
ret = RNAINTERACTION;
}
+ else if (name.equalsIgnoreCase("RNA Helices"))
+ {
+ ret = RNAHELIX;
+ }
// else if (name.equalsIgnoreCase("Covariation"))
// {
// ret = COVARIATION;
@@ -247,9 +254,10 @@ public class ColourSchemeProperty
{
index = TCOFFEE;
}
-
-
-
+ else if (cs instanceof RNAHelicesColour)
+ {
+ index = RNAHELIX;
+ }
/*
* else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
*/
@@ -344,11 +352,15 @@ 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";
+
+ break;
/*
* case COVARIATION: ret = "Covariation";
*
@@ -501,12 +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);
-
// break;
case USER_DEFINED:
@@ -584,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);
+ }
+ }
+
}