git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'JAL-1445' into develop
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemeProperty.java
diff --git
a/src/jalview/schemes/ColourSchemeProperty.java
b/src/jalview/schemes/ColourSchemeProperty.java
index
aa928cc
..
d608a80
100755
(executable)
--- a/
src/jalview/schemes/ColourSchemeProperty.java
+++ b/
src/jalview/schemes/ColourSchemeProperty.java
@@
-87,6
+87,8
@@
public class ColourSchemeProperty
public static final int TCOFFEE = 15;
public static final int TCOFFEE = 15;
+ public static final int RNAINTERACTION = 16;
+
/**
* index of first colourscheme (includes 'None')
*/
/**
* index of first colourscheme (includes 'None')
*/
@@
-167,6
+169,11
@@
public class ColourSchemeProperty
{
ret = PURINEPYRIMIDINE;
}
{
ret = PURINEPYRIMIDINE;
}
+
+ else if (name.equalsIgnoreCase("RNA Interaction type"))
+ {
+ ret = RNAINTERACTION;
+ }
// else if (name.equalsIgnoreCase("Covariation"))
// {
// ret = COVARIATION;
// else if (name.equalsIgnoreCase("Covariation"))
// {
// ret = COVARIATION;
@@
-240,6
+247,9
@@
public class ColourSchemeProperty
{
index = TCOFFEE;
}
{
index = TCOFFEE;
}
+
+
+
/*
* else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
*/
/*
* else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
*/
@@
-334,6
+344,11
@@
public class ColourSchemeProperty
ret = "T-Coffee Scores";
break;
ret = "T-Coffee Scores";
break;
+
+ case RNAINTERACTION:
+ ret = "RNA Interaction type";
+
+ break;
/*
* case COVARIATION: ret = "Covariation";
*
/*
* case COVARIATION: ret = "Covariation";
*
@@
-485,10
+500,14
@@
public class ColourSchemeProperty
case TCOFFEE:
cs = new TCoffeeColourScheme(coll);
case TCOFFEE:
cs = new TCoffeeColourScheme(coll);
- // case COVARIATION:
- // cs = new CovariationColourScheme(annotation);
+ break;
+
+
+
+ // case COVARIATION:
+ // cs = new CovariationColourScheme(annotation);
- // break;
+ // break;
case USER_DEFINED:
Color[] col = new Color[24];
case USER_DEFINED:
Color[] col = new Color[24];