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
JAL-2795 added error catching for invalid identifier
[jalview.git]
/
src
/
jalview
/
schemes
/
ClustalxColourScheme.java
diff --git
a/src/jalview/schemes/ClustalxColourScheme.java
b/src/jalview/schemes/ClustalxColourScheme.java
index
9df7ab8
..
ec13343
100755
(executable)
--- a/
src/jalview/schemes/ClustalxColourScheme.java
+++ b/
src/jalview/schemes/ClustalxColourScheme.java
@@
-43,8
+43,8
@@
public class ClustalxColourScheme extends ResidueColourScheme
{
RED(0.9f, 0.2f, 0.1f), BLUE(0.5f, 0.7f, 0.9f), GREEN(0.1f, 0.8f, 0.1f),
ORANGE(0.9f, 0.6f, 0.3f), CYAN(0.1f, 0.7f, 0.7f),
{
RED(0.9f, 0.2f, 0.1f), BLUE(0.5f, 0.7f, 0.9f), GREEN(0.1f, 0.8f, 0.1f),
ORANGE(0.9f, 0.6f, 0.3f), CYAN(0.1f, 0.7f, 0.7f),
- PINK(0.9f, 0.5f, 0.5f), MAGENTA(0.8f, 0.3f, 0.8f), YELLOW(0.8f, 0.8f,
- 0.0f);
+ PINK(0.9f, 0.5f, 0.5f), MAGENTA(0.8f, 0.3f, 0.8f),
+ YELLOW(0.8f, 0.8f, 0.0f);
final Color colour;
final Color colour;
@@
-53,6
+53,7
@@
public class ClustalxColourScheme extends ResidueColourScheme
colour = new Color(r, g, b);
}
}
colour = new Color(r, g, b);
}
}
+
private class ConsensusColour
{
Consensus[] cons;
private class ConsensusColour
{
Consensus[] cons;
@@
-296,8
+297,7
@@
public class ClustalxColourScheme extends ResidueColourScheme
for (int k = 0; k < residueColour[i].cons.length; k++)
{
for (int k = 0; k < residueColour[i].cons.length; k++)
{
- if (residueColour[i].cons[k].isConserved(cons2, j, size,
- includeGaps))
+ if (residueColour[i].cons[k].isConserved(cons2, j, size, includeGaps))
{
colour = residueColour[i].c;
}
{
colour = residueColour[i].c;
}