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-1632 dialog to calculate either Tree or PCA
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignViewport.java
diff --git
a/src/jalview/appletgui/AlignViewport.java
b/src/jalview/appletgui/AlignViewport.java
index
29df968
..
fc087c6
100644
(file)
--- a/
src/jalview/appletgui/AlignViewport.java
+++ b/
src/jalview/appletgui/AlignViewport.java
@@
-209,17
+209,17
@@
public class AlignViewport extends AlignmentViewport implements
if (colour != null)
{
if (colour != null)
{
- globalColourScheme = new ResidueShader(
+ residueShading = new ResidueShader(
ColourSchemeProperty.getColourScheme(alignment, colour));
ColourSchemeProperty.getColourScheme(alignment, colour));
- if (globalColourScheme != null)
+ if (residueShading != null)
{
{
- globalColourScheme.setConsensus(hconsensus);
+ residueShading.setConsensus(hconsensus);
}
}
if (applet.getParameter("userDefinedColour") != null)
{
}
}
if (applet.getParameter("userDefinedColour") != null)
{
- globalColourScheme = new ResidueShader(
+ residueShading = new ResidueShader(
new UserColourScheme(
applet.getParameter("userDefinedColour")));
}
new UserColourScheme(
applet.getParameter("userDefinedColour")));
}